diff --git a/Manifest.files.gz b/Manifest.files.gz
index 88631241ac49..99934271ad7c 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 81540f9a8cf1..e534f1b70129 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r1.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r1.ebuild
new file mode 100644
index 000000000000..a38a287da511
--- /dev/null
+++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="real-time metrics for nginx server (and others)"
+HOMEPAGE="https://github.com/lebinh/ngxtop"
+#SRC_URI="https://github.com/lebinh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/tabulate[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.0.2-py3.patch )
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 60ba819c1f15..bcea67713a24 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/iat/metadata.xml b/app-cdr/iat/metadata.xml
index b00d1366c7a0..2d6d1b606ee9 100644
--- a/app-cdr/iat/metadata.xml
+++ b/app-cdr/iat/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>ramage.lucas@protonmail.com</email>
-		<description>Lucas Ramage</description>
+		<name>Lucas Ramage</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 22d19e39cfdc..46cd98ff81f5 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
index ad134c9f6598..f3a3ade8f3b0 100644
--- a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
+++ b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
@@ -1,8 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+LUA_COMPAT=( lua5-2 )
+
+inherit lua-single
+
 DESCRIPTION="Tool to read the contents of smartcards"
 HOMEPAGE="http://pannetrat.com/Cardpeek"
 SRC_URI="http://downloads.pannetrat.com/install/${P}.tar.gz"
@@ -12,8 +16,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="libressl"
 
-RDEPEND="sys-apps/pcsc-lite
-	dev-lang/lua:5.2
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	sys-apps/pcsc-lite
 	x11-libs/gtk+:3
 	net-misc/curl
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/app-crypt/openpgp-keys-voikko/Manifest b/app-crypt/openpgp-keys-voikko/Manifest
new file mode 100644
index 000000000000..b6ed44916605
--- /dev/null
+++ b/app-crypt/openpgp-keys-voikko/Manifest
@@ -0,0 +1 @@
+DIST 4AE3942E.asc.html 5476 BLAKE2B 22b3acf6d4360b1686890596e7c8de2a3a38e739aa0ea4ae7fa7e09295127c7196f5af5750bd30d5260365206e08397e3bda970a4b7cdfb2d0827f80f2810758 SHA512 025bafbfe98e2437a3919f4651e7583a5fccd60ff110904189969ce5fe1770ed4222c60a530065b7720a0e233d1a138b55cd7df4c8f28337b9e953547434429c
diff --git a/app-crypt/openpgp-keys-voikko/metadata.xml b/app-crypt/openpgp-keys-voikko/metadata.xml
new file mode 100644
index 000000000000..6b0a0fb3a729
--- /dev/null
+++ b/app-crypt/openpgp-keys-voikko/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild b/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
new file mode 100644
index 000000000000..3b026f706808
--- /dev/null
+++ b/app-crypt/openpgp-keys-voikko/openpgp-keys-voikko-20201013.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign voikko* packages"
+HOMEPAGE="https://voikko.puimula.org/"
+SRC_URI="http://keys.gnupg.net/pks/lookup?op=get&search=0x3D309B604AE3942E -> 4AE3942E.asc.html"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins - voikko.asc < <(awk '/-----BEGIN PGP PUBLIC KEY BLOCK-----/,/-----END PGP PUBLIC KEY BLOCK-----/' ${DISTDIR}/4AE3942E.asc.html || die)
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 95dd0f1dd046..8c9c4964b59e 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/qemu/qemu-5.1.0-r1.ebuild b/app-emulation/qemu/qemu-5.1.0-r1.ebuild
index ffb4eb896bec..da90c984e5e8 100644
--- a/app-emulation/qemu/qemu-5.1.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-5.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="ncurses,readline"
 
 PLOCALES="bg de_DE fr_FR hu it sv tr zh_CN"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index e692f46e98a7..be46ec4e3cca 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
index 0013ae876aea..d5ea9fe82f68 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="|| ( CDDL LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 BDEPEND="dev-lang/perl
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c57f03f5bc57..1eff24596d81 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild b/app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild
new file mode 100644
index 000000000000..7be8fc3cacaf
--- /dev/null
+++ b/app-misc/chkcrontab/chkcrontab-1.7-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to detect crontab errors"
+HOMEPAGE="https://github.com/lyda/chkcrontab"
+SRC_URI="https://github.com/lyda/chkcrontab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	doman doc/${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/app-misc/worker/worker-3.8.3-r100.ebuild b/app-misc/worker/worker-3.8.3-r100.ebuild
new file mode 100644
index 000000000000..cf6618c8bd77
--- /dev/null
+++ b/app-misc/worker/worker-3.8.3-r100.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+inherit lua-single
+
+DESCRIPTION="Worker Filemanager: Amiga Directory Opus 4 clone"
+HOMEPAGE="http://www.boomerangsworld.de/cms/worker/"
+SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="avfs debug dbus examples libnotify lua +magic xinerama xft"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="x11-libs/libX11
+	avfs? ( >=sys-fs/avfs-0.9.5 )
+	dbus? (	dev-libs/dbus-glib )
+	lua? ( ${LUA_DEPS} )
+	magic? ( sys-apps/file )
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog INSTALL NEWS README README_LARGEFILES THANKS )
+
+src_configure() {
+	# there is no ./configure flag to disable libXinerama support
+	export ac_cv_lib_Xinerama_XineramaQueryScreens=$(usex xinerama)
+	econf \
+		--without-hal \
+		--enable-utf8 \
+		$(use_with avfs) \
+		$(use_with dbus) \
+		$(use_enable debug) \
+		$(use_enable libnotify inotify) \
+		$(use_enable lua) \
+		$(use_with magic libmagic) \
+		$(use_enable xft)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc examples/config-*
+	fi
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 5f9fd8470edf..1041138a3d42 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice-voikko/Manifest b/app-office/libreoffice-voikko/Manifest
index aeec9c2c8766..a7e9d315d819 100644
--- a/app-office/libreoffice-voikko/Manifest
+++ b/app-office/libreoffice-voikko/Manifest
@@ -1 +1,2 @@
 DIST libreoffice-voikko-5.0.tar.gz 51882 BLAKE2B c4d33f469821b3d3ee15f71c21a2e3fd5474939dda204873e85d9e52aee0d1cd9c01f660d63fdbef87786dbb0b8a88ba4fd45b8aff07b0b35588c9933d4c9cef SHA512 58f139c190acf5c56a8506365c296d06efd95b4422bb66c50e8058231bd10410b202d2a01ad0a2bf82dc0f41565c1e3a07ed86a4ae070d32af8cfd0e56d7eec0
+DIST libreoffice-voikko-5.0.tar.gz.asc 819 BLAKE2B 4305cd6cfccce6ee832cbda6c3b10a7676e94fa968c71f1894c178a3715ec00b477e745ef22b284b06190291748ac71dad2b43ea5d15e49833b0dcb53eabb7ca SHA512 7df7317018904700957691785ba80f1fcb390891fdbf6210a8eb06db5ac4ae1721b8175777685d062af08b52168dd94d5bb4b851c9405501781f1b1257a32cc3
diff --git a/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild b/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild
index 4dfc323f80ee..a3f28fbbb567 100644
--- a/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild
+++ b/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild
@@ -3,9 +3,12 @@
 
 EAPI=7
 
+inherit verify-sig
+
 DESCRIPTION="Free Finnish spell checking and hyphenation for LibreOffice"
 HOMEPAGE="https://voikko.puimula.org/"
-SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
+	verify-sig? ( https://www.puimula.org/voikko-sources/libreoffice-voikko/${P}.tar.gz.asc )"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -15,6 +18,9 @@ DEPEND="app-office/libreoffice[odk]
 	dev-libs/voikko-fi"
 RDEPEND="${DEPEND}
 	dev-libs/libvoikko"
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-voikko )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
 
 src_compile() {
 	emake oxt
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 94a02072e9f5..98ef56138929 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch b/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch
new file mode 100644
index 000000000000..a9dae6150454
--- /dev/null
+++ b/app-portage/gentoolkit/files/gentoolkit-0.5.0-r1-python3_9.patch
@@ -0,0 +1,34 @@
+From f14b6198d1dd9cb7f4a83f3822e4a1782a5581e8 Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <dolsen@gentoo.org>
+Date: Tue, 13 Oct 2020 10:04:07 -0400
+Subject: [PATCH] metadata.py: Fix duplicated use flag text bug 748129
+
+Regression from commit: 517581df206766
+link: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=517581df206766fabf10273cde565e0a6dc62829
+Gentoo bug: https://bugs.gentoo.org/748129
+Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
+---
+ pym/gentoolkit/metadata.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/pym/gentoolkit/metadata.py b/pym/gentoolkit/metadata.py
+index c3dba98..0b58392 100644
+--- a/pym/gentoolkit/metadata.py
++++ b/pym/gentoolkit/metadata.py
+@@ -101,8 +101,11 @@ class _Useflag(object):
+ 		if node.text:
+ 			_desc = node.text
+ 		for child in node.iter():
+-			_desc += child.text if child.text else ''
+-			_desc += child.tail if child.tail else ''
++			# prevent duplicate text
++			if child.text and child.text not in _desc:
++				_desc += child.text
++			if child.tail and not child.tail in _desc:
++				_desc += child.tail
+ 		# This takes care of tabs and newlines left from the file
+ 		self.description = re.sub(r'\s+', ' ', _desc)
+ 
+--
+libgit2 1.0.1
+
diff --git a/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
similarity index 95%
rename from app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild
rename to app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
index 18ac36af8767..77fdfb33cf18 100644
--- a/app-portage/gentoolkit/gentoolkit-0.5.0-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.5.0-r2.ebuild
@@ -27,7 +27,10 @@ RDEPEND="${DEPEND}
 
 distutils_enable_tests setup.py
 
-PATCHES=( "${FILESDIR}"/${PN}-0.5.0-python3_9.patch)
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-python3_9.patch
+	"${FILESDIR}"/${PN}-0.5.0-r1-python3_9.patch
+)
 
 python_prepare_all() {
 	python_setup
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index da345372b645..fc33c7139cb2 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/mpv-bash-completion/Manifest b/app-shells/mpv-bash-completion/Manifest
deleted file mode 100644
index e274df5a909f..000000000000
--- a/app-shells/mpv-bash-completion/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mpv-bash-completion-3.3.16.tar.gz 20125 BLAKE2B 1350445ea05474e553ade334c1f11e97828df11143021920a25787a295d6e870595e35dda6ccd048ed4e01e0e85443a5902893fed1aa1525e875649a93ef632d SHA512 d962cc911d571b0345ddee22ecae6faef307f2da44642d6db5223fb0e51d2b2087b038e1964cf8f1ed683bb95a3268a8ffc1fff2759561100b23921406a0e31f
-DIST mpv-bash-completion-3.3.17.tar.gz 20873 BLAKE2B 5e44b315a4f148c27768a3b0c29d609b679e3d489dd79803795a75a9289816ed13797cc04c748410ba3302a2619dedad21772f2d914b2c3ff5c73189e4e348df SHA512 a0b1ae4b07bd3e5fc95fea135aa5391d0efb0d2c1e4ccbb712cf0911b9e07b23a7bfb27d43b615988610f545f1bc62226998295573480ab657e3b18966d48991
diff --git a/app-shells/mpv-bash-completion/metadata.xml b/app-shells/mpv-bash-completion/metadata.xml
deleted file mode 100644
index f4e48989a36b..000000000000
--- a/app-shells/mpv-bash-completion/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<changelog>https://github.com/2ion/mpv-bash-completion/releases</changelog>
-		<remote-id type="github">2ion/mpv-bash-completion</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.16.ebuild b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.16.ebuild
deleted file mode 100644
index bb3736da0fec..000000000000
--- a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.16.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Bash completion for the mpv video player"
-HOMEPAGE="https://2ion.github.io/mpv-bash-completion/"
-SRC_URI="https://github.com/2ion/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="luajit"
-
-COMMON_DEPEND=">=media-video/mpv-0.25.0[cli]"
-RDEPEND="${COMMON_DEPEND}
-	>=app-shells/bash-completion-2.3-r1
-"
-DEPEND="${COMMON_DEPEND}
-	!luajit? ( dev-lang/lua:* )
-	luajit? ( dev-lang/luajit:2 )
-"
-
-src_prepare() {
-	default_src_prepare
-	# Avoid 'mpv' make target that supports lua only.
-	sed -i -e 's|check: mpv|check:|' Makefile || die
-}
-
-src_compile() {
-	# Prevent access violations from completion generation.
-	# See Gentoo bug 656086.
-	addpredict /dev/dri
-
-	$(usex luajit 'luajit' 'lua') gen.lua > mpv || die
-}
-
-src_install() {
-	dobashcomp mpv
-	einstalldocs
-}
-
-pkg_postinst() {
-	if ! has_version 'x11-apps/xrandr'; then
-		elog
-		elog "If you want completion of window sizes, please install 'x11-apps/xrandr'."
-		elog
-	fi
-}
diff --git a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.17.ebuild b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.17.ebuild
deleted file mode 100644
index bb3736da0fec..000000000000
--- a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.17.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="Bash completion for the mpv video player"
-HOMEPAGE="https://2ion.github.io/mpv-bash-completion/"
-SRC_URI="https://github.com/2ion/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="luajit"
-
-COMMON_DEPEND=">=media-video/mpv-0.25.0[cli]"
-RDEPEND="${COMMON_DEPEND}
-	>=app-shells/bash-completion-2.3-r1
-"
-DEPEND="${COMMON_DEPEND}
-	!luajit? ( dev-lang/lua:* )
-	luajit? ( dev-lang/luajit:2 )
-"
-
-src_prepare() {
-	default_src_prepare
-	# Avoid 'mpv' make target that supports lua only.
-	sed -i -e 's|check: mpv|check:|' Makefile || die
-}
-
-src_compile() {
-	# Prevent access violations from completion generation.
-	# See Gentoo bug 656086.
-	addpredict /dev/dri
-
-	$(usex luajit 'luajit' 'lua') gen.lua > mpv || die
-}
-
-src_install() {
-	dobashcomp mpv
-	einstalldocs
-}
-
-pkg_postinst() {
-	if ! has_version 'x11-apps/xrandr'; then
-		elog
-		elog "If you want completion of window sizes, please install 'x11-apps/xrandr'."
-		elog
-	fi
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2959b40bfd31..c6dbe03c5198 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index ad56d4802a23..d930e9f2e5e4 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,3 +1,3 @@
 DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
 DIST dos2unix-7.4.1.tar.gz 711570 BLAKE2B 3dbe33007aa3e2ef47ec3dc0c3165987986955fffd7ae1435725014d52ba716626e7891911afe11674beec11fa62a12983c8dfc28cff682ca0c3e798449a9b0f SHA512 81e7cff82d95b298fb218b073f54d17fa851a7507fbd54b3cd9af7c1efa6a7bd3cf59f7a84ffbaf395403bf458650763e1755944451b24f708878a9c62316dc4
-DIST dos2unix-7.4.2-beta1.tar.gz 712261 BLAKE2B 020b51a53b3b8ac601efd0f3fa424fbe5a42ca5b06e1f7282c2aca021e22b38aac21e4aa7b42ed428c95053d57bb5c35483881b06dc580b533eac2fe716142a2 SHA512 323c0dd90616bca1891f8228d43bca1c6415b5765f5fba4ccf5ce692da9b545c8f10f908ba5ebd65c3409fb4d9fdaaa2fb36d589faa8b5940d27ecf8f72bc422
+DIST dos2unix-7.4.2.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
diff --git a/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild b/app-text/dos2unix/dos2unix-7.4.2.ebuild
similarity index 96%
rename from app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild
rename to app-text/dos2unix/dos2unix-7.4.2.ebuild
index 21a971f34cee..591c044b4780 100644
--- a/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
+PLOCALES="da de eo es fr fur hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
 
 inherit l10n toolchain-funcs
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 7d7096950728..7c07b736ec93 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,2 +1,3 @@
 DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50
 DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9 SHA512 39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5
+DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
diff --git a/app-text/mupdf/files/mupdf-1.18-Makefile.patch b/app-text/mupdf/files/mupdf-1.18-Makefile.patch
new file mode 100644
index 000000000000..32ee7e57c493
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18-Makefile.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index b0fb617..528e117 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@
+ -include user.make
+ 
+ ifndef build
+-  build := release
++  build := debug
+ endif
+ 
+ ifndef OUT
+@@ -214,13 +214,15 @@ MUPDF_LIB = $(OUT)/libmupdf.$(SO)
+ 
+ $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ)
+ else
+-MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdf-third.a
++MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
++MUPDF_STATIC = $(OUT)/libmupdf.a
++THIRD_LIB = 
+ THREAD_LIB = $(OUT)/libmupdf-threads.a
+ PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
+ 
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
+-$(THIRD_LIB) : $(THIRD_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
++	$(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS)
++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+ endif
+@@ -374,7 +376,7 @@ install: libs apps
+ 
+ 	install -d $(DESTDIR)$(docdir)
+ 	install -d $(DESTDIR)$(docdir)/examples
+-	install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
++	install -m 644 README CHANGES $(DESTDIR)$(docdir)
+ 	install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
+ 	install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
+ 
diff --git a/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch
new file mode 100644
index 000000000000..0576033a03a2
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch
@@ -0,0 +1,128 @@
+Refreshed patches based on:
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
+--- a/Makefile
++++ b/Makefile
+@@ -147,6 +147,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
+ 
+ HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
+ 
++$(HEXDUMP_EXE): scripts/hexdump.c
++	$(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
++
+ FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff))
+ FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc))
+ FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf))
+--- a/Makerules
++++ b/Makerules
+@@ -6,6 +6,9 @@ OS := $(OS:MSYS%=MINGW)
+ OS := $(OS:Windows_NT=MINGW)
+ OS := $(OS:Darwin=MACOS)
+ 
++PKG_CONFIG ?= pkg-config
++CC_FOR_BUILD ?= $(CC)
++
+ ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
+   # clang does not support these in combination with -fembed-bitcode
+   CFLAGS += -ffunction-sections -fdata-sections
+@@ -128,51 +128,51 @@ else ifeq ($(OS),MACOS)
+ else ifeq ($(OS),Linux)
+   HAVE_OBJCOPY := yes
+ 
+-  ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+-	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+-	SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
++  ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
++	SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
++	SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
+   endif
+-  ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
+-	SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
+-	SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
++  ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes)
++	SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo)
++	SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo)
+   endif
+-  ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
+-	SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
+-	SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
++  ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
++	SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
++	SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
+   endif
+-  ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
+-	SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
+-	SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
++  ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
++	SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
++	SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
+   endif
+-  ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
+-	SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
+-	SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
++  ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
++	SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
++	SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
+   endif
+-  ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
+-	SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
+-	SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
++  ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
++	SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
++	SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
+   endif
+-  ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
+-	SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
+-	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
++  ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
++	SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
++	SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
+   endif
+ 
+-  HAVE_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
++  HAVE_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes)
+   ifeq ($(HAVE_LEPTONICA),yes)
+-	SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
+-	SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
++	SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept)
++	SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept)
+   endif
+ 
+-  HAVE_TESSERACT := $(shell pkg-config --exists 'tesseract-ocr >= 4.0.0' && echo yes)
++  HAVE_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract-ocr >= 4.0.0' && echo yes)
+   ifeq ($(HAVE_TESSERACT),yes)
+-	SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract)
+-	SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract)
++	SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract)
++	SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract)
+   endif
+ 
+-  HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
++  HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes)
+   ifeq ($(HAVE_SYS_CURL),yes)
+-	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+-	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
++	SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
++	SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
+   endif
+ 
+   HAVE_GLUT := yes
+@@ -183,14 +183,14 @@ else ifeq ($(OS),Linux)
+ 
+   HAVE_X11 := not-unless-portage-tells-me
+   ifeq ($(HAVE_X11),yes)
+-	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+-	X11_LIBS := $(shell pkg-config --libs x11 xext)
++	X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
++	X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
+   endif
+ 
+   HAVE_LIBCRYPTO := not-unless-portage-tells-me
+   ifeq ($(HAVE_LIBCRYPTO),yes)
+-	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
+-	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
++	LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO
++	LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto)
+   endif
+ 
+   HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c
new file mode 100644
index 000000000000..dc4000b4cde6
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c
@@ -0,0 +1,102 @@
+From b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54 Mon Sep 17 00:00:00 2001
+From: Robin Watts <Robin.Watts@artifex.com>
+Date: Thu, 8 Oct 2020 16:15:40 +0100
+Subject: [PATCH] Bug 701297: Harden populate_ui against unexpected repairs.
+
+We count the number of layers, and allocate space for them in
+an array. We then walk the tree reading details of those layers
+in. If we hit a problem that causes a repair while reading the
+information, the number of layers can magically increase. In
+the existing code we run off the end of the array.
+
+In the new code we watch for hitting the end of the array and
+realloc as required.
+---
+ source/pdf/pdf-layer.c | 32 +++++++++++++++++++++++++-------
+ 1 file changed, 25 insertions(+), 7 deletions(-)
+
+diff --git a/source/pdf/pdf-layer.c b/source/pdf/pdf-layer.c
+index 177f0c947..b8e9d7cad 100644
+--- a/source/pdf/pdf-layer.c
++++ b/source/pdf/pdf-layer.c
+@@ -104,10 +104,27 @@ count_entries(fz_context *ctx, pdf_obj *obj)
+ }
+ 
+ static pdf_ocg_ui *
+-populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked)
++get_ocg_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill)
++{
++	if (fill == desc->num_ui_entries)
++	{
++		/* Number of layers changed while parsing;
++		 * probably due to a repair. */
++		int newsize = desc->num_ui_entries * 2;
++		if (newsize == 0)
++			newsize = 4; /* Arbitrary non-zero */
++		desc->ui = fz_realloc_array(ctx, desc->ui, newsize, pdf_ocg_ui);
++		desc->num_ui_entries = newsize;
++	}
++	return &desc->ui[fill];
++}
++
++static int
++populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked)
+ {
+ 	int len = pdf_array_len(ctx, order);
+ 	int i, j;
++	pdf_ocg_ui *ui;
+ 
+ 	for (i = 0; i < len; i++)
+ 	{
+@@ -118,7 +135,7 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
+ 				continue;
+ 
+ 			fz_try(ctx)
+-				ui = populate_ui(ctx, desc, ui, o, depth+1, rbgroups, locked);
++				fill = populate_ui(ctx, desc, fill, o, depth+1, rbgroups, locked);
+ 			fz_always(ctx)
+ 				pdf_unmark_obj(ctx, o);
+ 			fz_catch(ctx)
+@@ -126,14 +143,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
+ 
+ 			continue;
+ 		}
+-		ui->depth = depth;
+ 		if (pdf_is_string(ctx, o))
+ 		{
++			ui = get_ocg_ui(ctx, desc, fill++);
++			ui->depth = depth;
+ 			ui->ocg = -1;
+ 			ui->name = pdf_to_str_buf(ctx, o);
+ 			ui->button_flags = PDF_LAYER_UI_LABEL;
+ 			ui->locked = 1;
+-			ui++;
+ 			continue;
+ 		}
+ 
+@@ -144,13 +161,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
+ 		}
+ 		if (j == desc->len)
+ 			continue; /* OCG not found in main list! Just ignore it */
++		ui = get_ocg_ui(ctx, desc, fill++);
++		ui->depth = depth;
+ 		ui->ocg = j;
+ 		ui->name = pdf_dict_get_string(ctx, o, PDF_NAME(Name), NULL);
+ 		ui->button_flags = pdf_array_contains(ctx, o, rbgroups) ? PDF_LAYER_UI_RADIOBOX : PDF_LAYER_UI_CHECKBOX;
+ 		ui->locked = pdf_array_contains(ctx, o, locked);
+-		ui++;
+ 	}
+-	return ui;
++	return fill;
+ }
+ 
+ static void
+@@ -188,7 +206,7 @@ load_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_obj *ocprops, pdf_obj *oc
+ 	desc->ui = Memento_label(fz_calloc(ctx, count, sizeof(pdf_ocg_ui)), "pdf_ocg_ui");
+ 	fz_try(ctx)
+ 	{
+-		(void)populate_ui(ctx, desc, desc->ui, order, 0, rbgroups, locked);
++		desc->num_ui_entries = populate_ui(ctx, desc, 0, order, 0, rbgroups, locked);
+ 	}
+ 	fz_catch(ctx)
+ 	{
diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c
new file mode 100644
index 000000000000..d19f0593a119
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c
@@ -0,0 +1,41 @@
+From 32e4e8b4bcbacbf92af7c88337efae21986d9603 Mon Sep 17 00:00:00 2001
+From: Robin Watts <Robin.Watts@artifex.com>
+Date: Thu, 8 Oct 2020 18:10:28 +0100
+Subject: [PATCH] Bug 702958: Fix overflow in fz_clear_pixmap_with_value.
+
+---
+ source/fitz/pixmap.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/source/fitz/pixmap.c b/source/fitz/pixmap.c
+index 66873d214..80d8bb62f 100644
+--- a/source/fitz/pixmap.c
++++ b/source/fitz/pixmap.c
+@@ -555,7 +555,8 @@ void
+ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
+ {
+ 	unsigned char *s;
+-	int w, h, n, stride, len;
++	int w, h, n;
++	ptrdiff_t stride, len;
+ 	int alpha = pix->alpha;
+ 
+ 	w = pix->w;
+@@ -572,7 +573,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
+ 
+ 	n = pix->n;
+ 	stride = pix->stride;
+-	len = w * n;
++	len = (ptrdiff_t)w * n;
+ 
+ 	s = pix->samples;
+ 	if (value == 255 || !alpha)
+@@ -584,7 +585,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
+ 		}
+ 		while (h--)
+ 		{
+-			memset(s, value, (unsigned int)len);
++			memset(s, value, len);
+ 			s += stride;
+ 		}
+ 	}
diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild b/app-text/mupdf/mupdf-1.16.1.ebuild
index d93fa2a0f2ed..a073710586e8 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic toolchain-funcs xdg desktop
 
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="https://mupdf.com/"
 SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 
diff --git a/app-text/mupdf/mupdf-1.17.0.ebuild b/app-text/mupdf/mupdf-1.17.0.ebuild
index 73a2ee992231..f195aa318853 100644
--- a/app-text/mupdf/mupdf-1.17.0.ebuild
+++ b/app-text/mupdf/mupdf-1.17.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit desktop flag-o-matic toolchain-funcs xdg
 
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="https://mupdf.com/"
 SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 S="${WORKDIR}/${P}-source"
diff --git a/app-text/mupdf/mupdf-1.18.0.ebuild b/app-text/mupdf/mupdf-1.18.0.ebuild
new file mode 100644
index 000000000000..c7cab5a41c8c
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.18.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
+S="${WORKDIR}/${P}-source"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +javascript libressl opengl ssl static-libs"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	>=dev-lang/mujs-1.0.7:=[static-libs?]
+	dev-libs/gumbo
+	media-libs/freetype:2=[static-libs?]
+	media-libs/harfbuzz:=[static-libs?,truetype]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/libpng:0=[static-libs?]
+	>=media-libs/openjpeg-2.1:2=[static-libs?]
+	virtual/jpeg[static-libs?]
+	opengl? ( >=media-libs/freeglut-3.0.0:= )
+	ssl? (
+		libressl? ( >=dev-libs/libressl-3.2.0:0=[static-libs?] )
+		!libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
+	)
+	X? (
+		x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?]
+	)"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="opengl? ( !static-libs )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.18-Makefile.patch
+	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+	# See bugs #662352
+	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+	# General cross fixes from Debian (refreshed)
+	"${FILESDIR}"/${PN}-1.18.0-cross-fixes.patch
+	# Additional security patches post-1.18.0
+	"${FILESDIR}"/${P}-fix-oob-in-pdf-layer.c
+	"${FILESDIR}"/${P}-fix-oob-in-pixmap.c
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	use hppa && append-cflags -ffunction-sections
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h || die
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getLD)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}/usr" \
+		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+		-i Makerules || die
+}
+
+_emake() {
+	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+
+	# Bundled libs
+	# * General
+	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+	# recommendations. It does not mean "always use system libs".
+	# See [0] below for what it means in a specific version.
+	#
+	# * freeglut
+	# We don't use system's freeglut because upstream has a special modified
+	# version of it that gives mupdf clipboard support. See bug #653298
+	#
+	# * mujs
+	# As of v1.15.0, mupdf started using symbols in mujs that were not part
+	# of any release. We then went back to using the bundled version of it.
+	# But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+	# when bumping and check!
+	# See bug #685244
+	#
+	# * lmms2
+	# mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+	# It is therefore not appropriate for us to unbundle it at this time.
+	#
+	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+
+	emake \
+		GENTOO_PV=${PV} \
+		HAVE_GLUT=$(usex opengl) \
+		HAVE_LIBCRYPTO=$(usex ssl) \
+		HAVE_X11=$(usex X) \
+		USE_SYSTEM_LIBS=yes \
+		USE_SYSTEM_MUJS=yes \
+		USE_SYSTEM_GLUT=no \
+		HAVE_OBJCOPY=no \
+		"$@"
+}
+
+src_compile() {
+	_emake XCFLAGS="-fpic"
+
+	use static-libs && \
+		_emake build/debug/lib${PN}.a
+}
+
+src_install() {
+	if use X || use opengl ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1 || die
+	fi
+
+	_emake install
+
+	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a build/debug/lib${PN}.a
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+
+	# Respect libdir (bug #734898)
+	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index bae9cd3ae6eb..5b20144afe9c 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index 193be934366a..1c02427fa735 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1 +1 @@
-DIST platformio-4.3.4.tar.gz 190096 BLAKE2B 593fb04e78cc04a3fe939de4ea11617ae267dc2427009a168a50d0172774962c34faba5d9fef861980b09172efad8401154dc812040a5867c7c320a0d5728273 SHA512 751a737eeb425238094c00defcd2094b511e2cfb5792a965323b87d46113a94e03e7be35dbe3e5ecde0c096fda5f372c9ab9863b779cb58e0c5abc36885475d6
+DIST platformio-5.0.1.tar.gz 211141 BLAKE2B f42498d3232ee6954e9d591939235da4dd8e6028ca5bc5c28cd32293825a9bddb31a164beb9227b5f55d2fed43981ae161db1eb404917a12a3114e5868106d27 SHA512 4037f646676bce9807ae522ef70324749d3ccc342a9f06c959c888b40fc5f1658d98a912244ee196c1afcf4a871a8232c35c1744794bc5a8b6e0a82c309606df
diff --git a/dev-embedded/platformio/platformio-4.3.4.ebuild b/dev-embedded/platformio/platformio-5.0.1.ebuild
similarity index 94%
rename from dev-embedded/platformio/platformio-4.3.4.ebuild
rename to dev-embedded/platformio/platformio-5.0.1.ebuild
index e7bf816f15dc..4a0f1155325f 100644
--- a/dev-embedded/platformio/platformio-4.3.4.ebuild
+++ b/dev-embedded/platformio/platformio-5.0.1.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index 94b439cdcb65..c9beddfdd613 100644
Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ
diff --git a/dev-erlang/epam/Manifest b/dev-erlang/epam/Manifest
index 6c8ff9be278e..e5e3b0447ac5 100644
--- a/dev-erlang/epam/Manifest
+++ b/dev-erlang/epam/Manifest
@@ -1,4 +1,2 @@
-DIST epam-1.0.2.tar.gz 43720 BLAKE2B 39a1056d068bdceb7ff640a498b0766aa59649228b03e03f9385bfc106f45aa210315162d4386907a1e9cbc8f177289adebf72f527a4eaf270cd62413f1daa13 SHA512 a3fdb379d8c25e56e51dcf1e683d289e9f3d19a537b1a55ca4c09185eb5731fe073a5bf0dd1449f09f8ee5b7d868b0e63f04473c1f3d1b97722dcd9832e4e030
-DIST epam-1.0.6.tar.gz 47494 BLAKE2B 8120e4f10222468ee2adf2f0ec9cffcaaea8c1fc92faf9889de0f970562631cb54cd9ba34d01994dcf657108c4232158d5617e4b9c884bc84e5eb383028b8e3f SHA512 2c316a46ac734be2c74a86e767b413fa8ff1b296622b85de4828fdd60c84e5b3962f8b76004fcb39ab43a345ec967e3f3db4ac6d0e7335dc982dbcf1edf02c4b
-DIST epam-1.0.7.tar.gz 47506 BLAKE2B 8ac8026623a653c4d0f897fb08044003c2426ca1309b1e57cbdb6f6ece4662fd15143293e1dae1f806cbc3d6cf028712701e2587750de15f44304ed7e28c17bd SHA512 ddfcb6a0ef955e6ef0fba2c98e25fbc8532c829b80c4150d0545bb9b5114773184af0adba49921cf6e2363a0224dedccd7bf81b5da292dda74f8966a8e73e1b2
 DIST epam-1.0.8.tar.gz 47334 BLAKE2B be914b0a5e4657e3ddb3e9bcb607448b14451e112c0b929159a962ca8bdc778e6d7d358fb4053b500e71fddc2fbd16ce6d5b543a5f592c9037d71b4ec09aacc7 SHA512 b09624b7d1650ae741bcfcdddceacf5bfd29bb3e00a4044498d6eaec328f8762423f71025fb89a8242c76934c56b8d60f1910fc390766382468f3d844723bef2
+DIST epam-1.0.9.tar.gz 47548 BLAKE2B b0a8c6e07d788160e153c75e6d8c6535f68279f1f404b25c0fe5ad1559251059a6efd38a9a30c5b180513f69fb22674ba772c29fa598bed5ddc6dcacd9f0f419 SHA512 f537dbfdba09b3f65775e2235e90e2e91951908d95cd10df05581c740d7254cce53a3a2f4131df75f5c6400b3b2cdf6b37651a554076e9cfa66fb3c627d8562c
diff --git a/dev-erlang/epam/epam-1.0.2.ebuild b/dev-erlang/epam/epam-1.0.2.ebuild
deleted file mode 100644
index f718c6eefb54..000000000000
--- a/dev-erlang/epam/epam-1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar user
-
-DESCRIPTION="epam for ejabberd to help with PAM authentication support"
-HOMEPAGE="https://github.com/processone/epam"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
-
-pkg_setup() {
-	enewgroup "${PN}"
-}
-
-src_install() {
-	rebar_src_install
-
-	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
-	fowners root:"${PN}" "${epam_path}"
-	fperms 4750 "${epam_path}"
-}
diff --git a/dev-erlang/epam/epam-1.0.6.ebuild b/dev-erlang/epam/epam-1.0.6.ebuild
deleted file mode 100644
index 529ffdd2798f..000000000000
--- a/dev-erlang/epam/epam-1.0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar user
-
-DESCRIPTION="epam for ejabberd to help with PAM authentication support"
-HOMEPAGE="https://github.com/processone/epam"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-pkg_setup() {
-	enewgroup "${PN}"
-}
-
-src_install() {
-	rebar_src_install
-
-	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
-	fowners root:"${PN}" "${epam_path}"
-	fperms 4750 "${epam_path}"
-}
diff --git a/dev-erlang/epam/epam-1.0.7.ebuild b/dev-erlang/epam/epam-1.0.9.ebuild
similarity index 100%
rename from dev-erlang/epam/epam-1.0.7.ebuild
rename to dev-erlang/epam/epam-1.0.9.ebuild
diff --git a/dev-erlang/eredis/Manifest b/dev-erlang/eredis/Manifest
index 3bfad9fbc36f..5e2faf8b5e03 100644
--- a/dev-erlang/eredis/Manifest
+++ b/dev-erlang/eredis/Manifest
@@ -1 +1,2 @@
 DIST eredis-1.0.8.tar.gz 124993 BLAKE2B d668e9e98657a63db18c67e16293622c631520c138f51f84e9ce0ecdf0d972647863cede6713d1e9882460d0447929732d3925636eb0286d21c1bce3488630f8 SHA512 416bb6197980613c9c6e5739e46aebcc6d2033959672bbde1d349a880b5201e0444ccf09f320978c31199e2df096fab6b7656671c1a091c9448ee72548bc1bfb
+DIST eredis-1.2.0.tar.gz 28568 BLAKE2B dfd50a2fc6367322677dab02fc1e84dcb1ea1eef622be2c2b3994798a59a0d4c78c58d5852cf9205df9dc5d03d8dac6cab3991f16b601d3227749e1734ac9ffd SHA512 c72ae291389e47d1ac4c1de69dccb6121f4f9195283665d490904226b2ea15cb7671b48bb08db507a5e62c6bced62d890a9ecb9752da6e0aad24a28da137907c
diff --git a/dev-erlang/eredis/eredis-1.2.0.ebuild b/dev-erlang/eredis/eredis-1.2.0.ebuild
new file mode 100644
index 000000000000..c42dd4e10149
--- /dev/null
+++ b/dev-erlang/eredis/eredis-1.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang Redis client"
+HOMEPAGE="https://github.com/wooga/eredis"
+SRC_URI="https://github.com/wooga/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS  CHANGELOG.md  README.md )
+
+# Needs running redis instance at 127.0.0.1:6379.
+RESTRICT=test
diff --git a/dev-erlang/esip/Manifest b/dev-erlang/esip/Manifest
index fe6419ad805c..ebbf5550c23b 100644
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@@ -1 +1,2 @@
 DIST esip-1.0.34.tar.gz 89545 BLAKE2B 7411bbba155706abd9b5e8ad187d7a04cce0eb6a9185c30559b116df56869bc7753272390a8dbe3fe10b155f0f9c35a86c2dbd99ec7cb84556741ddc060b901d SHA512 d324c7b5a12a73516548d4dc735fd7c5f93d466efce409d870b4436ec975d004ab14b2750ef9ba98388819d5842ae0065c804f141a4c3e5e6747154fd8161bff
+DIST esip-1.0.37.tar.gz 89632 BLAKE2B 6a733b5b09a50e79f9dfdbcb8fe2678fd7698f78559513052faf67e286da664b6f766d12f6dc6244ed922b5257ab2b2bebb593ff7ecee200e5dd6707a34c122a SHA512 8862154b4b43d177acb522107c193d0b19db28cde686538e565102f4303c16cffd3571d37a31edb00fd8ba436f2a847eeabf575fbb22cb7c1287160e266e207f
diff --git a/dev-erlang/esip/esip-1.0.37.ebuild b/dev-erlang/esip/esip-1.0.37.ebuild
new file mode 100644
index 000000000000..25657fea93df
--- /dev/null
+++ b/dev-erlang/esip/esip-1.0.37.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="ProcessOne SIP server component"
+HOMEPAGE="https://github.com/processone/esip"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-erlang/fast_tls-1.1.8
+	>=dev-erlang/stun-1.0.37
+	>=dev-erlang/p1_utils-1.0.20"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_fix_include_path stun
+
+	# ebin contains lonely .gitignore file asking for removal.
+	rm -r "${S}/ebin" || die
+}
diff --git a/dev-erlang/ezlib/Manifest b/dev-erlang/ezlib/Manifest
index 74bf3d5705d4..9e291ec9e744 100644
--- a/dev-erlang/ezlib/Manifest
+++ b/dev-erlang/ezlib/Manifest
@@ -1,3 +1,2 @@
-DIST ezlib-1.0.2.tar.gz 45369 BLAKE2B d2d23cf9fcd530a76ed4a386df15401cd9598e158f20cba3eff19332e25532fdaba8cae93e576f5756559e74f169f6a01f9d09c41e844d3af4a9d9d3cac15185 SHA512 90671fdf0bbc23a7f54da665dfb31a3ed2d92180ff5c58d872001481584e6c8b39cd84b3dc947f1efdae10792c2547218017381cbc7056070d22b140e941c9bb
-DIST ezlib-1.0.6.tar.gz 49136 BLAKE2B 596e3580a20d7b8174ded16656fd5f15b8558ffe16a1278e76a25dcff935c258b2df37fb5be0c4e78de566823c41c58941fffa95cdae8b02a21bf6ea5d6f5417 SHA512 6f2a459f773eeba9a7d1316a5c38c686b54c5c68bb3d90e38ac4698fb1140c2d1b961e981af5013711fbfd854f3b3f206a828b6eda9071fd437ccdf4871d8e39
 DIST ezlib-1.0.7.tar.gz 49143 BLAKE2B 51a1bd0972024dd6dc905266c375d7097fd3f9e45d00ca23d16f11d335b3511b29202db2c6a64e4d0727bd0c447205be857bc9291ea5e771e0fe081829bfc25b SHA512 25fdc429c8d1216756b9c048058c711176a3292670dcd9ee156038362b49b7d5f4be325a3f67da5f24e462f188429d2247e42eca12da806748298a9966494382
+DIST ezlib-1.0.8.tar.gz 49200 BLAKE2B d4147ae45f91619342e82c25efdd29fd25e5528aee52f2a79636c0492cb50a2e49b5c7c6c5737aedba0001df4c0798cf30e8043fa5274b4818c1754f80ae4a20 SHA512 49b2e7d03995d4e43c023b8910e7644f3332e444b194bc7621cc35fd4d41e10692649250875462b1eca9a606312138c6f50812a32c9224f72e70ce4f2a9e6422
diff --git a/dev-erlang/ezlib/ezlib-1.0.2.ebuild b/dev-erlang/ezlib/ezlib-1.0.2.ebuild
deleted file mode 100644
index 8f0b847b543e..000000000000
--- a/dev-erlang/ezlib/ezlib-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Native zlib driver for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/ezlib"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1:=
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/ezlib/ezlib-1.0.6.ebuild b/dev-erlang/ezlib/ezlib-1.0.8.ebuild
similarity index 92%
rename from dev-erlang/ezlib/ezlib-1.0.6.ebuild
rename to dev-erlang/ezlib/ezlib-1.0.8.ebuild
index e3d64871c7f0..f9b2e9950f08 100644
--- a/dev-erlang/ezlib/ezlib-1.0.6.ebuild
+++ b/dev-erlang/ezlib/ezlib-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-erlang/mqtree/Manifest b/dev-erlang/mqtree/Manifest
index 774af7c0c01c..1fe0bc7440a1 100644
--- a/dev-erlang/mqtree/Manifest
+++ b/dev-erlang/mqtree/Manifest
@@ -1,3 +1,2 @@
-DIST mqtree-1.0.4.tar.gz 227872 BLAKE2B 756542c77cecd3da12917c43c5c1a36f54af0bc18b66d1571d1a7428378fcd3c643168c182c3215ab5f7890b8292ef89248424567f6aa608c074548b055e0774 SHA512 5033c89bfbaba34a357bfd8d7981c75c362f7e9d039ef6035aad66e3562f848ff047fbbd612b51dfde79a0f7233337afb4a47dac5df369fa1c5e14b5d5b1911f
-DIST mqtree-1.0.5.tar.gz 227940 BLAKE2B db8edddfb91b52bced394221ed3c3a91cc552f45165f78f1bc0177e80f54a97d9d8843037e59f8c5fdc70bbf04f7016276c3667da4bc54055e9ca2aa9ecbe9df SHA512 c624ffbd97bd0bb0076ca246ad9bcf0a443ea1334dc3b8f553c5559e6ee07d134ea275c3bd121dfddabed5ff9a90ee8dd21d1283663f8e4252fa4eeb105eba62
+DIST mqtree-1.0.10.tar.gz 228863 BLAKE2B c8a0a611ec125c5e1dbe56677975cdae4da14e2c01ff0a6b6356d85886563c3cc60c7364ad5a3cc584bff9d891a7f4982341a0ce62ae5b9cad4c7bdcc80bbbb2 SHA512 89ab5e9a30028b5539d522d90951a92bbee93e91cac103127323d0d79a11ea13df3210cf61ae6bcb64b4f6d1d557562a03f651754b1f15f8d31f1e8015b31859
 DIST mqtree-1.0.7.tar.gz 227967 BLAKE2B 72cad70ab53038eed09ba4444f0c21c9767405aac4b573c60a6ae0ef84737c1da248189e4dc5b08f0f197ca0f6cfd66a51bed1867d6cba591a9aec8ce8298501 SHA512 efca5119bfbdaab5637855ff20016061fadeed6b9ebc6b3db03686b37daba1b36b1ddafe805c953eadc77f8cbde3c6c4943d1aa39ae4c9a96eed3f97f64ca37f
diff --git a/dev-erlang/mqtree/mqtree-1.0.5.ebuild b/dev-erlang/mqtree/mqtree-1.0.10.ebuild
similarity index 76%
rename from dev-erlang/mqtree/mqtree-1.0.5.ebuild
rename to dev-erlang/mqtree/mqtree-1.0.10.ebuild
index 3af65b751547..06bfc2fc63d4 100644
--- a/dev-erlang/mqtree/mqtree-1.0.5.ebuild
+++ b/dev-erlang/mqtree/mqtree-1.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,10 +12,10 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND=">=dev-lang/erlang-17.5
-	>=dev-erlang/p1_utils-1.0.16"
+	>=dev-erlang/p1_utils-1.0.20"
 RDEPEND="${DEPEND}"
 
 DOCS=( README.md )
diff --git a/dev-erlang/mqtree/mqtree-1.0.4.ebuild b/dev-erlang/mqtree/mqtree-1.0.4.ebuild
deleted file mode 100644
index 3af65b751547..000000000000
--- a/dev-erlang/mqtree/mqtree-1.0.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Index tree for MQTT topic filters"
-HOMEPAGE="https://github.com/processone/mqtree"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-lang/erlang-17.5
-	>=dev-erlang/p1_utils-1.0.16"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/p1_acme/Manifest b/dev-erlang/p1_acme/Manifest
index 77967a6255c0..34777247480d 100644
--- a/dev-erlang/p1_acme/Manifest
+++ b/dev-erlang/p1_acme/Manifest
@@ -1 +1,2 @@
 DIST p1_acme-1.0.5.tar.gz 220724 BLAKE2B 7f236f9e66dc982342c15c46ebe2a391f72384710b19e1007d1e9ff679a9701190650853b8e67c3a63abba5e6a4107ed921fdc25f5cce984a4333fab98449f37 SHA512 e21907c18311b98cc865cddd155291fae09f739b5429a42810ba93fae77abe3f4e3ecaf9accf0d42d38e21bb823987dea0c3175ea1b7f20b171afa06a932f9e1
+DIST p1_acme-1.0.8.tar.gz 221082 BLAKE2B 1e4b23f638b4f7bb877edf290aa54cdf45733816488ab518acc83bd268c240aa564ba1299674f8f938c059b4f2c0072f95d05b017d79419f3ac55d709eb812fe SHA512 8b2b4c594dc1dcbfcf9bb7a6b98096128791d416092a73109fd74ef7ab715d469c87ac6d66056cc5dcd5692c6e71936dc25afa86445a6ffc8164c5bc4f2b1869
diff --git a/dev-erlang/p1_acme/p1_acme-1.0.8.ebuild b/dev-erlang/p1_acme/p1_acme-1.0.8.ebuild
new file mode 100644
index 000000000000..4351e3e2e95b
--- /dev/null
+++ b/dev-erlang/p1_acme/p1_acme-1.0.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="ACME client library for Erlang"
+HOMEPAGE="https://github.com/processone/p1_acme"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/jiffy-1.0.5
+	>=dev-erlang/yconf-1.0.7
+	>=dev-erlang/idna-6.0.0
+	>=dev-erlang/jose-1.9.0
+	>=dev-erlang/base64url-1.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	# otherwise it wants to fetch base64url from git
+	sed -ri 's/\+\+ \[\{base64url.*//' rebar.config.script
+}
diff --git a/dev-erlang/p1_mysql/Manifest b/dev-erlang/p1_mysql/Manifest
index 4001fe45dfd3..97d24b7e2953 100644
--- a/dev-erlang/p1_mysql/Manifest
+++ b/dev-erlang/p1_mysql/Manifest
@@ -1,4 +1,2 @@
-DIST p1_mysql-1.0.11.tar.gz 25958 BLAKE2B 6c94287fc584ed530d70e9609cc565c2c66a2b90b8bb47d85e370353e8e56dd9cb8e902406eaf330692f70c264f44977f22534e6805017a12accdcb5828a45e1 SHA512 2929b1e66aa887258b46f7dcda71f935230b9b7ea9fccf0baff2cda0782a5b7da26b9b396ed2bf3b16f07d397c88f5881ea93913a11e262be802654ac46dd9ed
-DIST p1_mysql-1.0.14.tar.gz 26922 BLAKE2B 83b22c454a069fc14f7cfb82a7cb42eb4d43d3f560329159ddf503bbfe19a5f44ee7279489c5c0d028b63285c47d62e1416af24f70ad38927125de466c2b9414 SHA512 ab60ab6b43e3cca9e14e28075f1276cff02dc796a3074662c797ac2e46a38afb2726719de64bfd61e9a27b2d31665f33551d0680e137eb6167b9d32c8721e1e5
 DIST p1_mysql-1.0.15.tar.gz 26943 BLAKE2B 191a7dcfae3b5f9e3f7c317aa10ad818147f0fa81b2ab06263ba45eea9c2771133c2c8b43a707d32ea4faf875d711ec63d14882eb58aed7a4715fd27e42fbdf8 SHA512 ef1d94095ef7dbe0e260a85cd0ec9c9449e199456acd991bfa42434126a2d6d731c6068e613de4cd4a9dbc3b3540f14bf85cce127e324475ea8a72f61657acb6
-DIST p1_mysql-1.0.2.tar.gz 19512 BLAKE2B 8cf7cded80d6ca1239019f3d1bbb7d4babbe0336a09b6c8ebb55e116eeb592e35a6f332ee6950c78ac6559a3850bdc1dbfa50ded2d30e008deb8e8d50b5c86d2 SHA512 ac0656b3134cfae47161a4643188784cf71e8ea19bbd5856e58d4f1d508a8771534975a631da51e7574e5adb3f64cdd250ab59ab7e9138fd5cb865e80522bd11
+DIST p1_mysql-1.0.16.tar.gz 26959 BLAKE2B 6c61a7127e35af39106559b9cc31c4774cda3ef66d630173865d52afccf9822db67a3b4753674df3a00644deafa87d1b82525f0ca6377009a22a1cbaced03a69 SHA512 f2b2ad57ce5918df231af2462a83c11babdb9d4b787e59ffee7c9dd48a38439a121ee2631927934bd12a9d98932c4d7a03a9313a58b1715102dc932d26eddb56
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.14.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.16.ebuild
similarity index 100%
rename from dev-erlang/p1_mysql/p1_mysql-1.0.14.ebuild
rename to dev-erlang/p1_mysql/p1_mysql-1.0.16.ebuild
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.2.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.2.ebuild
deleted file mode 100644
index fde9ce59075d..000000000000
--- a/dev-erlang/p1_mysql/p1_mysql-1.0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Pure Erlang MySQL driver"
-HOMEPAGE="https://github.com/processone/p1_mysql"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/p1_oauth2/Manifest b/dev-erlang/p1_oauth2/Manifest
index 892aca86c169..48a6cf24b289 100644
--- a/dev-erlang/p1_oauth2/Manifest
+++ b/dev-erlang/p1_oauth2/Manifest
@@ -1,3 +1,2 @@
-DIST p1_oauth2-0.6.1.tar.gz 212804 BLAKE2B 571341aaa4d3a4bac6ac2f8f46d2e4b9caf5e00622a392635d79ff11b520a3cab71d360220c99a46035ce851974d975d69a71ac9b1be626c9b126941fc4a73cf SHA512 2509d48775579a26178fb5a082e628a8487c986b1b4d4abe974b653a1e0b7605bed934d59f6d62927582bdb95a53ba454816d326d99a77c5360928c4973ade4a
-DIST p1_oauth2-0.6.5.tar.gz 213847 BLAKE2B de1b9dc238efacf5682ad12b1b563fc311f1e0515673003286b31f42ebd33fb8dd9e384aed194047cd6ab38d4769ab128e8de5241004ce49f72d56ad9ca22d21 SHA512 5664aba423c85d90321533878b73e58b50d7ef3bc4183c8108c99e075ef4e75041eb28620de4dc14be23dfaac3623a858a9c8e191e54dae62eb9688ea0812312
 DIST p1_oauth2-0.6.6.tar.gz 213866 BLAKE2B 2b7ff13697658c6ab31a2cab60100758d965ae0f3cbeb878539e42210e54e7cf33a458c645e432790f79ba3fa92ab35a5d6d6136edc14369ac6d8872e16d7f69 SHA512 9680bc96608bc486165d5f77cf6e92e5f9257e0dbea718c739563556c2b485f67152dcd99cbe228addd34b33b2dd6cc9eacc3827f269412f705acd14b2522952
+DIST p1_oauth2-0.6.7.tar.gz 213885 BLAKE2B 42f363b3afec9368957bd788f43359a40a5929b7efb22078681caa8827fdb315f4b0063c3004b92bd92da2664d37b860d606e8c14124fe3d214fed2219e98117 SHA512 485db5926f11759ee447e40d2d2e3a9c66f949510b40adeb0c90ab9deac500dd01178e9b65cea6044e389af3881ad3a300222bd879b69b3a55d84ba3d718a166
diff --git a/dev-erlang/p1_oauth2/p1_oauth2-0.6.1.ebuild b/dev-erlang/p1_oauth2/p1_oauth2-0.6.1.ebuild
deleted file mode 100644
index 45a97620b3b4..000000000000
--- a/dev-erlang/p1_oauth2/p1_oauth2-0.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Erlang OAuth 2.0 implementation"
-HOMEPAGE="https://github.com/processone/p1_oauth2"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-lang/erlang-17.1"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-erlang/meck-0.8.3
-		>=dev-erlang/proper-1.1_p20150814
-	)"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
-
-src_prepare() {
-	rebar_src_prepare
-	rebar_remove_deps rebar.test.config
-	sed -e '/, warnings_as_errors/d' -i rebar.test.config || die
-}
-
-src_test() {
-	erebar -C rebar.test.config compile eunit
-}
diff --git a/dev-erlang/p1_oauth2/p1_oauth2-0.6.5.ebuild b/dev-erlang/p1_oauth2/p1_oauth2-0.6.7.ebuild
similarity index 94%
rename from dev-erlang/p1_oauth2/p1_oauth2-0.6.5.ebuild
rename to dev-erlang/p1_oauth2/p1_oauth2-0.6.7.ebuild
index 87f8db520570..42c445437f3e 100644
--- a/dev-erlang/p1_oauth2/p1_oauth2-0.6.5.ebuild
+++ b/dev-erlang/p1_oauth2/p1_oauth2-0.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-erlang/p1_pgsql/Manifest b/dev-erlang/p1_pgsql/Manifest
index 093545e4009d..7e41bd75c1dd 100644
--- a/dev-erlang/p1_pgsql/Manifest
+++ b/dev-erlang/p1_pgsql/Manifest
@@ -1,4 +1,2 @@
-DIST p1_pgsql-1.1.2.tar.gz 19347 BLAKE2B fc8d052dd77037b20a99fc147c55392c4d731eef6f098b6b805c4441e44b7a16ce6dce44c88ac2fa325d47fbadfa11fdc9c75b1f2039112699c2ab1b1dc6af42 SHA512 e5ead1e41e5dd0b9ec1ff96e6d133b8a5eaea38f6eb343391f5a7cc9757c3255730b147a621a8d55f7e0be2798186aedba0af2434ed96a981fa8f19c4ba8927e
-DIST p1_pgsql-1.1.6.tar.gz 20545 BLAKE2B 17e5f2dc5f08ff830ae2b17a80950e45a0df7f939b8d42bf6a4a373c76818997c040b57f5db4cca3d0767d98c4684c0f61a610822d4c43c5138e61589cf57b8f SHA512 7bed2f44a134cdae1738c2a09257a406fe292a0f6bfb587eecb6597c1b4c6e9ea45d2ed6022ccc6a9a00fe008e4d99b2df4896ac2f0654e1daf7369a39dd60c9
-DIST p1_pgsql-1.1.8.tar.gz 24162 BLAKE2B cd65c347f6ae651cd9baa053ab12117948f55d9c10ac5541768cf3a36f1086f513c6059353f91564587ee17ef21d1772bdb220159f877a27db35b86e034601e6 SHA512 ab156cfc3da979802a619855783bc114f5a0d75625467cf144e63cdf22187c30dc8d66d541addc54e4402c95bebcfb3900b1883e29e741af398c83419f5b71c3
+DIST p1_pgsql-1.1.10.tar.gz 24073 BLAKE2B 541c12e72a7be558f7c9fcfb64c88ddcdfbc258ce33f2fd66b8bfdfaaed83f1a1194dfea6225abd1a601ef08d9a9e792c844f778bc1be4bbf94e8107c6e024a7 SHA512 d1385b71681f487822839041f01ca7241573fd3a4b3616e7f0508b2d604ce37273168e8ddf9e403edc6cb08d73c908c373727e26a970ee7ba67ea57de8524409
 DIST p1_pgsql-1.1.9.tar.gz 24175 BLAKE2B cab26e09e89fda82431cd29a3a09c9fd309868021bfad3d5110fd5b40ccd19c9b6eee40d77debb1cde86bc77f139123ce282305500774f5650ebf7c647bec532 SHA512 5a24bfdf13bf015d0a92cbba74dbe09122b900bed994495fbccd51616ee6fc3032fc571847813ef4631d2c6a947985302818c067d19a3ab50e190de6f0f2cf1b
diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.8.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.10.ebuild
similarity index 92%
rename from dev-erlang/p1_pgsql/p1_pgsql-1.1.8.ebuild
rename to dev-erlang/p1_pgsql/p1_pgsql-1.1.10.ebuild
index 95ef7ffd0379..ca41d386004e 100644
--- a/dev-erlang/p1_pgsql/p1_pgsql-1.1.8.ebuild
+++ b/dev-erlang/p1_pgsql/p1_pgsql-1.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.2.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.2.ebuild
deleted file mode 100644
index 9be95c4df2ec..000000000000
--- a/dev-erlang/p1_pgsql/p1_pgsql-1.1.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Pure Erlang PostgreSQL driver"
-HOMEPAGE="https://github.com/processone/p1_pgsql"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="ErlPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.6.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.6.ebuild
deleted file mode 100644
index 0806c222c3e6..000000000000
--- a/dev-erlang/p1_pgsql/p1_pgsql-1.1.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="Pure Erlang PostgreSQL driver"
-HOMEPAGE="https://github.com/processone/p1_pgsql"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="ErlPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md  README.md )
diff --git a/dev-erlang/pkix/Manifest b/dev-erlang/pkix/Manifest
index cd9456dc7396..57354bf005ea 100644
--- a/dev-erlang/pkix/Manifest
+++ b/dev-erlang/pkix/Manifest
@@ -1,3 +1,2 @@
-DIST pkix-1.0.3.tar.gz 391302 BLAKE2B 8ff0403b6beed707afb8cca51c027d140f06273def0cff3588c9ee26673021d1fbb5b7397281c7daa27f076d61a222843251ab626661727f65255012846f9756 SHA512 b45c8fc74a1ef7d61818ba8a72bb141fa28796dadc36829f3456f1a87b5c263a5d708e4512cd91f54efd59dc14a47e31aa67ecb90c378f22fd42e77d6110320f
-DIST pkix-1.0.4.tar.gz 411737 BLAKE2B 5f675adc535a5463d2259c078a5445348bf9901224f78daff5b1b261796888d90f6707a3d6fd199fa611f347a560f8154d8c2122aeeacea6df776e8aec62708a SHA512 2c90bc13dc381f08b250db105eb09729005d1d191a1d6e69e2096f155f40460ebe47cb85a1b157782cb74c5e759b53010bc96fc831a7224f5a3aa30e46775b16
 DIST pkix-1.0.5.tar.gz 411755 BLAKE2B bd4b8cd87f1cabff7aa6923007aff9f586bb5e3e322978223a8533087ed2474816b578023a7269f37fb2afabafc4e2ce51606ba420c3b4cfea2e2b4e0f5c0af2 SHA512 b265f4ffb104404d38c9e6c5660e91a720d6b1a85339f82b40fae27727c4edbde585a1427682cf5ca59fe0be775fde26d74cbd4807f45b12b381736d2979595d
+DIST pkix-1.0.6.tar.gz 411903 BLAKE2B d6673421fe8ab96f8521ad6122b3ef5b3fece3b3dfbeafba3a5bb67ff528a158419c132247ac258a8f8adaa9947b132b5589245da0b9a23dbb7f3c91963c1013 SHA512 28bcadf4dfc44f494dedd34b8a37a1e77c76ebb59aaa8113a8886be15f01e6a11bb689278437140513fba9552c507a0b9d7ca7587ec92ccf037641aed55345e8
diff --git a/dev-erlang/pkix/pkix-1.0.3.ebuild b/dev-erlang/pkix/pkix-1.0.3.ebuild
deleted file mode 100644
index 5080a4c93518..000000000000
--- a/dev-erlang/pkix/pkix-1.0.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="PKIX certificates management library for Erlang"
-HOMEPAGE="https://github.com/processone/pkix"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-lang/erlang-17.5"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/pkix/pkix-1.0.4.ebuild b/dev-erlang/pkix/pkix-1.0.6.ebuild
similarity index 75%
rename from dev-erlang/pkix/pkix-1.0.4.ebuild
rename to dev-erlang/pkix/pkix-1.0.6.ebuild
index 5080a4c93518..149b5c02cfe2 100644
--- a/dev-erlang/pkix/pkix-1.0.4.ebuild
+++ b/dev-erlang/pkix/pkix-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,9 +12,6 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND=">=dev-lang/erlang-17.5"
-RDEPEND="${DEPEND}"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 
 DOCS=( README.md )
diff --git a/dev-erlang/sqlite3/Manifest b/dev-erlang/sqlite3/Manifest
index 5c144676d456..9c10206d5c31 100644
--- a/dev-erlang/sqlite3/Manifest
+++ b/dev-erlang/sqlite3/Manifest
@@ -1,3 +1,2 @@
-DIST sqlite3-1.1.5.tar.gz 1833901 BLAKE2B 19b02655962e4f70b01826e1346c93119a2a9bc8474083b0cb7719cdf8096d7fe7e33c3e8f17bb1d1bf11e32f4f9707fc2bb15ba6bfa848d2318a9e6c517d85b SHA512 894f39ba0760d15c4adf396d277cc30414c28acbc62135395af6939f769cab9237e836d5c3dcb5250c41917bec3db577902c01dbad1d2600480b3647c3c61c30
-DIST sqlite3-1.1.6.tar.gz 1834834 BLAKE2B 43b8bb8c10888aebd8842ffe410c1aa2506606dd99c551778b08b2c70788c4bce201758a0bb950e949d25a1d49351c17e2d225c2ad165588378d166959b7485a SHA512 f3781c186f4f677340bf752884559e9afe745726b6e8dfeb8b701ab34a5e58af0e7dba8bd852443f44fac874a1af66970ea29b044ff2f0cfbbeafbb4996cdc8d
 DIST sqlite3-1.1.7.tar.gz 1834822 BLAKE2B 9a3f30a3a5f4e7ebe38aa1a808057767dd6d43ab93b352b44fc3aef4c2ed8c19b5f4ee258a4ff7a2c052fb4f480f1fb3629624a171b07eb5e661acbc97b165b2 SHA512 8e4bd7dff93f7629d648934c4ce29c318d62313aa10de35144e4f6a3d8c87d8a423ccbe1c810476f8e8048358be4cb8ef242daa6138957e0b0d9c65fadbf144c
+DIST sqlite3-1.1.8.tar.gz 1881308 BLAKE2B 0a73a422c678ef1827608cabb18dba28d11d260b91788caebbb8ad65355f60fc3b842df119da68fedf356013e52509a87ed4c0c7f117e024484069e0ef722fb5 SHA512 056630056680f6606c6acf303521bc31ccf514163e4f02df3575535fe31eda74380306baa505734ab0e92a2bb82b35cc4fab81d11c3a409f855b202440b6247e
diff --git a/dev-erlang/sqlite3/sqlite3-1.1.5.ebuild b/dev-erlang/sqlite3/sqlite3-1.1.5.ebuild
deleted file mode 100644
index aa0125b074ce..000000000000
--- a/dev-erlang/sqlite3/sqlite3-1.1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-MY_PN="erlang-sqlite3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLite gen_server port for Erlang"
-HOMEPAGE="https://github.com/processone/erlang-sqlite3"
-SRC_URI="https://github.com/processone/${MY_PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="ErlPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	dev-db/sqlite:3"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS README.md )
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-erlang/sqlite3/sqlite3-1.1.6.ebuild b/dev-erlang/sqlite3/sqlite3-1.1.8.ebuild
similarity index 85%
rename from dev-erlang/sqlite3/sqlite3-1.1.6.ebuild
rename to dev-erlang/sqlite3/sqlite3-1.1.8.ebuild
index 66a221f881cb..fad82199d9b9 100644
--- a/dev-erlang/sqlite3/sqlite3-1.1.6.ebuild
+++ b/dev-erlang/sqlite3/sqlite3-1.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/processone/${MY_PN}/archive/${PV}.tar.gz
 
 LICENSE="ErlPL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND=">=dev-lang/erlang-17.1
 	dev-db/sqlite:3"
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index 3bf93342aa2d..77ef3e649f4b 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -1 +1,2 @@
 DIST stringprep-1.0.20.tar.gz 98836 BLAKE2B 8928bbc502f98101d93554430fce240b441ce6eff5c3c8f2f7727d77821ae7f92a63d2a4d9b1883ca8b8e61cdbf07858e1c2d2892cefda15797ae536430fcee5 SHA512 402556387e4467d5770694378c923676fa4a429ee6709c7d6aa94901b1215fc7227dc1ad9d9561ca4d94880175ee64241e6ab1274c2c20212d27fc56faffae8d
+DIST stringprep-1.0.22.tar.gz 98910 BLAKE2B 5885aa58a7201408467afa7ec6c4fda350effaf2c4f0ce3000f036fd67c16e778344e23a71f753abb6337db5e2084b147ef3b24878c1ca2bc0e1e308945a46ba SHA512 3cd687ede237de24476b091d0e871bbb4af42be21cf27ea44936413ba2b643d0c6f92b5c7135b7064b8e111e05f0a0815b0d32e6d33b60e46612bc0f7bfd3b09
diff --git a/dev-erlang/stringprep/stringprep-1.0.22.ebuild b/dev-erlang/stringprep/stringprep-1.0.22.ebuild
new file mode 100644
index 000000000000..26bf847cef05
--- /dev/null
+++ b/dev-erlang/stringprep/stringprep-1.0.22.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stringprep"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/p1_utils-1.0.20"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stun/Manifest b/dev-erlang/stun/Manifest
index 79303847f3fb..a43d581a5ab1 100644
--- a/dev-erlang/stun/Manifest
+++ b/dev-erlang/stun/Manifest
@@ -1 +1,2 @@
 DIST stun-1.0.33.tar.gz 34863 BLAKE2B 84a501f19c332aad98d61e5f7f75c8866e44b4b1243e2d7498221cc8b717380475ec07bc962781375ad21b694e186a73a903446cd1bc6ed5b23536a2420c3602 SHA512 864eae964bf9e4f19338a6429bfbf4cefb114f9dcd8893410a8345373f6cacd82d04b2902feadfb340e927b335cf0a6415629564cc7cf03a5dcf7d1f3cb5ea12
+DIST stun-1.0.38.tar.gz 39142 BLAKE2B 47efcd8d91bce2a4aab7b927a3adade62aeabd166464bc5c54f24db5088dda709c19f2155995398dd29de72eb3ee8ee5f10bfdffb37a839189a7f8375dacdf78 SHA512 a9a99440bfdf151d306e2da26d60eac5756bbaee41ece07d7b31634c66e7ac646bd8167b50e47a014a9b74a72510de34b5ac3dd75b03256cb2d792e796f0d6de
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.11.ebuild b/dev-erlang/stun/stun-1.0.38.ebuild
similarity index 58%
rename from dev-erlang/p1_mysql/p1_mysql-1.0.11.ebuild
rename to dev-erlang/stun/stun-1.0.38.ebuild
index 274bc47ea8a6..8aff6c238be2 100644
--- a/dev-erlang/p1_mysql/p1_mysql-1.0.11.ebuild
+++ b/dev-erlang/stun/stun-1.0.38.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit rebar
 
-DESCRIPTION="Pure Erlang MySQL driver"
-HOMEPAGE="https://github.com/processone/p1_mysql"
+DESCRIPTION="STUN and TURN library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stun"
 SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 	-> ${P}.tar.gz"
 
@@ -14,7 +14,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 
-DEPEND=">=dev-lang/erlang-17.1"
+DEPEND=">=dev-erlang/fast_tls-1.1.8
+	>=dev-erlang/p1_utils-1.0.20"
 RDEPEND="${DEPEND}"
 
 DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/xmpp/Manifest b/dev-erlang/xmpp/Manifest
index 4d65c276164c..50df0c62f0eb 100644
--- a/dev-erlang/xmpp/Manifest
+++ b/dev-erlang/xmpp/Manifest
@@ -1 +1,2 @@
 DIST xmpp-1.4.7.tar.gz 483070 BLAKE2B fae845a165a44c6c43e2f23ebf67a272c9a9b7dabcd221c8be6b83b6f560e7eee896a7906b9d621cba49de1af2163e64cd93d24bfd1341fe1d232c2746f80237 SHA512 37968de29bfeba698424f69a91f11c9adeca3bbac342cb9267ce4012471c10aeb030b691af2c5c01c6eaf9e1f866666982a8660a0e937829f75e0548ae5516cd
+DIST xmpp-1.4.9.tar.gz 483243 BLAKE2B 15cd04d5e99357ab4dac71fe7ee9952059658b56894c205e2d5b6c705b347004e580715c5198fcbc026b34e17033ad08da622eab92c83934de58500a8c64b905 SHA512 9c66ca3099584ea971f863ab24ccdca070bede63bedbf2fc858df762c27c329d07d3d119f7ced8ffcc1c24acf8874a68ee7372f157e81836e46dba27b057b381
diff --git a/dev-erlang/xmpp/xmpp-1.4.9.ebuild b/dev-erlang/xmpp/xmpp-1.4.9.ebuild
new file mode 100644
index 000000000000..de578b6dac81
--- /dev/null
+++ b/dev-erlang/xmpp/xmpp-1.4.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="XMPP parsing and serialization library on top of Fast XML"
+HOMEPAGE="https://github.com/processone/xmpp"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=dev-erlang/ezlib-1.0.8
+	>=dev-erlang/fast_tls-1.1.8
+	>=dev-erlang/fast_xml-1.1.43
+	>=dev-erlang/p1_utils-1.0.20
+	>=dev-erlang/stringprep-1.0.22
+	>=dev-erlang/idna-6.0.0"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_fix_include_path fast_xml
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d4a754bd6c22..56f0dff3cce0 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/mujs/Manifest b/dev-lang/mujs/Manifest
index 4118652c76a6..138a4ae94957 100644
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@@ -1,2 +1,3 @@
 DIST mujs-1.0.6.tar.gz 121385 BLAKE2B b74da9cc9df6c51d81fe4b6170fddd9bfd3e37cc1c48509ddbcc9b657feb7169cfa98427770a118fb9c0923e70320668198739ea111cbd5d1c2303b2ada7093d SHA512 c3062348dcc79b8ea3726fc528b3ba765d3462232059617b9ab221ba47fa904cc81a305a6199a9a2cea24a2d891ca63d475b4884cd4e53fa715b3a55f51ca4d9
 DIST mujs-1.0.7.tar.xz 93928 BLAKE2B 3c29ad3c23b75ee310824a36c0b08ede07b4ebaebff78558d07bc0eda55d6a994551502089cebd5b53ae24364ec1170e0865b7f1560d909dd15a18040666fea2 SHA512 30cc06ce4a608e091d46ba903ffc2eda29972cf583eb077d7824627fa20423c4721a406bf4271ebd5e5cade74f34e19acc9cffbc6d4d44314085a5525e91564f
+DIST mujs-1.0.9.tar.gz 123113 BLAKE2B c55deaf14508c412394bf5fe3a53ef581d4e4726024d65f2ba5155eb2400a6e2f043c9f6721b170d19297e2cd38c62c462f3b4e102eb4bfe6e7857b40156c18b SHA512 a3dbc8dbf5c16b7de9803954fe38ea9f77c0e5b7de3895966ec0877e063d463c9950499791ea0d102e464bd0426413689f3edb15e38db3f13915d72f27556725
diff --git a/dev-lang/mujs/mujs-1.0.9.ebuild b/dev-lang/mujs/mujs-1.0.9.ebuild
new file mode 100644
index 000000000000..969bb1812134
--- /dev/null
+++ b/dev-lang/mujs/mujs-1.0.9.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="An embeddable Javascript interpreter in C."
+HOMEPAGE="
+	https://mujs.com/
+	https://github.com/ccxvii/mujs/
+"
+SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+# Not available right now.
+#SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
+
+LICENSE="ISC"
+# subslot matches SONAME
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND="sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.5-flags.patch"
+)
+
+src_prepare() {
+	default
+
+	tc-export AR CC
+
+	# library's ABI (and API) changes in ~each release:
+	# diff 'usr/includemujs.h' across releases to validate
+	append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV}
+}
+
+src_compile() {
+	emake VERSION=${PV} prefix=/usr shared
+}
+
+src_install() {
+	local myeconfargs=(
+		DESTDIR="${ED}"
+		install-shared
+		libdir="/usr/$(get_libdir)"
+		prefix="/usr"
+		VERSION="${PV}"
+		$(usex static-libs install-static '')
+	)
+
+	emake "${myeconfargs[@]}"
+
+	mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die
+
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
+}
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 01c355f89498..bdcf6a4915f0 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,5 +1,7 @@
 DIST ocaml-4.04.2.tar.gz 4061873 BLAKE2B 756936592c7e0c87da27f154f07850eb3e4b2ed46ff3b36ff57541375840cd56b170dbe646ef6682f63d4e15ae209d3c125581803641f07403e9eb838c265519 SHA512 8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
 DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
 DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B 80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd SHA512 dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
+DIST ocaml-4.10.0.tar.gz 4927867 BLAKE2B 71b8448a10bf3049e3b005dfbb2030d479e69e4c2ef00055f1dacd38eff838b0a5c18b4883d899b5eb4cbd05bb7ca35867010794ed25682ad51b2fe19ef2114d SHA512 f39269d572b3f7755f7881b7a9fdfe5253e49d847835ae2a8695f67e3309fc1e925523d66ecbe1fb8bc0cc3b5602e077ce7feac4926aab571383766442265179
+DIST ocaml-4.11.1.tar.gz 5069552 BLAKE2B a731d4b60d7965c860dda5c9dfb26b968320760501ff3cac908b8cd96e34391c417e16077cdf753b27b85a79857451e6ff0b566a9158178026a0e6bd5240aac4 SHA512 93fa8b2ff71d5f645e3ed72913205e7d35aa523cfa87d1939d77e796495b94c2fdb4a429ea65330cdeecfb0a36f7ab053b15090d9baa151b58e5331148dc8150
 DIST ocaml-patches-8.tar.bz2 1803 BLAKE2B 5e76a198c2f5ca9f231d4e80499d784cf061ec79bf6b5e3aac917e1260d1f2b927f0f8015d39c01ce4fd481d32a5d211c31e081a7ab87ba1e7c7d5def95bc0fb SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/metadata.xml b/dev-lang/ocaml/metadata.xml
index 8493c343059b..1b869c8a3d97 100644
--- a/dev-lang/ocaml/metadata.xml
+++ b/dev-lang/ocaml/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<use>
 		<flag name="flambda">Enables the Flambda optimizer: A new intermediate representation (introduced in ocaml 4.03) in the depths of the compiler designed to allow for better inlining.</flag>
 		<flag name="spacetime">Enables the Spacetime memory profiler. See https://caml.inria.fr/pub/docs/manual-ocaml/spacetime.html for more information.</flag>
diff --git a/dev-lang/ocaml/ocaml-4.10.0.ebuild b/dev-lang/ocaml/ocaml-4.10.0.ebuild
new file mode 100644
index 000000000000..73512531e69a
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.10.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+HOMEPAGE="https://ocaml.org/"
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
+
+RDEPEND="sys-libs/binutils-libs:=
+	spacetime? ( sys-libs/libunwind:= )"
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+	xemacs? ( app-xemacs/ocaml )"
+
+#PATCHES=("${FILESDIR}"/${PN}-4.10.0-gcc-10.patch)
+
+src_prepare() {
+	default
+	# Upstream build ignores LDFLAGS in several places.
+	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+		-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+		-e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+		Makefile.config.in || die "LDFLAGS fix failed"
+	# ${P} overrides upstream build's own P due to a wrong assignment operator.
+	sed -i -e 's/^P ?=/P =/' stdlib/StdlibModules || die "P fix failed"
+}
+
+src_configure() {
+	local opt=(
+		--bindir="${EPREFIX}/usr/bin"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		$(use_enable flambda)
+		$(use_enable spacetime)
+	)
+	econf ${opt[@]}
+}
+
+src_compile() {
+	if use ocamlopt ; then
+		emake world.opt
+	else
+		emake world
+	fi
+}
+
+src_test() {
+	if use ocamlopt ; then
+		# OCaml tests only work when run sequentially
+		emake -j1 -C testsuite all
+	else
+		ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
+	fi
+}
+
+src_install() {
+	default
+	dodir /usr/include
+	# Create symlink for header files
+	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
+	dodoc Changes README.adoc
+	# Create envd entry for latex input files
+	if use latex ; then
+		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
+		doenvd "${T}/99ocamldoc"
+	fi
+	# Install ocaml-rebuild portage set
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/ocaml.conf"
+}
diff --git a/dev-lang/ocaml/ocaml-4.11.1.ebuild b/dev-lang/ocaml/ocaml-4.11.1.ebuild
new file mode 100644
index 000000000000..1afc9e3e1b3a
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.11.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+HOMEPAGE="https://ocaml.org/"
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
+
+RDEPEND="sys-libs/binutils-libs:=
+	spacetime? ( sys-libs/libunwind:= )"
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+	xemacs? ( app-xemacs/ocaml )"
+
+src_prepare() {
+	default
+	# Upstream build ignores LDFLAGS in several places.
+	sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+		-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+		-e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+		Makefile.config.in || die "LDFLAGS fix failed"
+}
+
+src_configure() {
+	local opt=(
+		--bindir="${EPREFIX}/usr/bin"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		$(use_enable flambda)
+		$(use_enable spacetime)
+	)
+	econf ${opt[@]}
+}
+
+src_compile() {
+	if use ocamlopt ; then
+		env -u P emake world.opt
+	else
+		env -u P emake world
+	fi
+}
+
+src_test() {
+	if use ocamlopt ; then
+		# OCaml tests only work when run sequentially
+		emake -j1 tests
+	else
+		ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
+	fi
+}
+
+src_install() {
+	default
+	dodir /usr/include
+	# Create symlink for header files
+	dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
+	dodoc Changes README.adoc
+	# Create envd entry for latex input files
+	if use latex ; then
+		echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
+		doenvd "${T}/99ocamldoc"
+	fi
+	# Install ocaml-rebuild portage set
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/ocaml.conf"
+}
diff --git a/dev-lang/rust-bin/rust-bin-1.47.0-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.47.0-r1.ebuild
index 0e17e12827ee..1dfce793c3b8 100644
--- a/dev-lang/rust-bin/rust-bin-1.47.0-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.47.0-r1.ebuild
@@ -22,11 +22,10 @@ RDEPEND=">=app-eselect/eselect-rust-20190311"
 REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
 
 QA_PREBUILT="
-	opt/${P}/bin/*-${PV}
-	opt/${P}/lib/*.so
-	opt/${P}/lib/rustlib/*/bin/*
-	opt/${P}/lib/rustlib/*/lib/*.so
-	opt/${P}/lib/rustlib/*/lib/*.rlib*
+	opt/${P}/bin/.*
+	opt/${P}/lib/.*.so
+	opt/${P}/lib/rustlib/.*/bin/.*
+	opt/${P}/lib/rustlib/.*/lib/.*
 "
 
 pkg_pretend() {
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3a77d453a79b..d12ed1dab947 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index e546b0b57c9a..b54bb404607e 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,2 @@
-DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495448f8bf35514b780fd12bb1b81c822314e1f598c7625277f1e9cf7a6265387cca80ffd4c2664c681b9d4807fd SHA512 ee15928ecdb0127720b444b0207d46fd68fe3007125b0deb8bdd32f96e9befb684ad54009354da4f6a3c48b9698693b46223710a47fd644da8760dda53d40d34
 DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B 1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031 SHA512 0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18
 DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e SHA512 12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4
diff --git a/dev-libs/botan/botan-2.14.0-r1.ebuild b/dev-libs/botan/botan-2.14.0-r1.ebuild
deleted file mode 100644
index 366559333192..000000000000
--- a/dev-libs/botan/botan-2.14.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-MY_P="Botan-${PV}"
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
-	boost? ( >=dev-libs/boost-1.48:= )
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	lzma? ( app-arch/xz-utils:= )
-	sqlite? ( dev-db/sqlite:3= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-BDEPEND="
-	dev-lang/python:*
-	doc? ( dev-python/sphinx )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-bindist-test-fix.patch"
-)
-
-src_configure() {
-	local disable_modules=()
-	use boost || disable_modules+=( "boost" )
-	use bindist && disable_modules+=( "ecdsa" )
-	elog "Disabling modules: ${disable_modules[@]}"
-
-	# Enable v9 instructions for sparc64
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
-		CHOSTARCH="sparc32-v9"
-	else
-		CHOSTARCH="${CHOST%%-*}"
-	fi
-
-	local myos=
-	case ${CHOST} in
-		*-darwin*) myos=darwin ;;
-		*) myos=linux  ;;
-	esac
-
-	case ${CHOST} in
-		hppa*) CHOSTARCH=parisc ;;
-	esac
-
-	local pythonvers=()
-	if use python; then
-		append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-		python_foreach_impl append
-	fi
-
-	# Don't install automatically, do it manually later in right place
-	# https://bugs.gentoo.org/723096
-	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
-		$(use_enable static-libs static-library) \
-		$(use_with boost) \
-		$(use_with bzip2) \
-		$(use_with doc documentation) \
-		$(use_with doc sphinx) \
-		$(use_with lzma) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		$(usex hppa --without-stack-protector '') \
-		--cc=gcc \
-		--cpu=${CHOSTARCH} \
-		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
-		--docdir=share/doc \
-		--libdir=$(get_libdir) \
-		--os=${myos} \
-		--distribution-info="Gentoo ${PVR}" \
-		--prefix="${EPREFIX}/usr" \
-		--with-endian="$(tc-endian)" \
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
-		--without-doxygen \
-		--no-install-python-module \
-		|| die "configure.py failed"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	default
-	use python && python_foreach_impl python_domodule src/python/botan2.py
-}
diff --git a/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch b/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch
deleted file mode 100644
index 35b17976dbd5..000000000000
--- a/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://github.com/randombit/botan/commit/df73ee690c5795be586cd4df3e33253113a0dcdf
-https://github.com/randombit/botan/commit/d9d6d7a593da135d2046aeb8a9e05e967d90f538
-
-diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
-index 47a5bf5e56..07dc86ef21 100644
---- a/src/tests/test_pkcs11_high_level.cpp
-+++ b/src/tests/test_pkcs11_high_level.cpp
-@@ -909,6 +909,15 @@ BOTAN_REGISTER_TEST("pkcs11-rsa", PKCS11_RSA_Tests);
- 
- /***************************** PKCS11 ECDSA *****************************/
- 
-+#if defined(BOTAN_HAS_ECC_GROUP)
-+std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
-+   {
-+   std::vector<uint8_t> enc;
-+   DER_Encoder(enc).encode(point.encode(PointGFp::UNCOMPRESSED), OCTET_STRING);
-+   return enc;
-+   }
-+#endif
-+
- #if defined(BOTAN_HAS_ECDSA)
- 
- Test::Result test_ecdsa_privkey_import()
-@@ -976,13 +985,6 @@ Test::Result test_ecdsa_privkey_export()
-    return result;
-    }
- 
--std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
--   {
--   std::vector<uint8_t> enc;
--   DER_Encoder(enc).encode(point.encode(PointGFp::UNCOMPRESSED), OCTET_STRING);
--   return enc;
--   }
--
- Test::Result test_ecdsa_pubkey_import()
-    {
-    Test::Result result("PKCS11 import ECDSA public key");
-diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
-index 07dc86ef21..c77e8ea42e 100644
---- a/src/tests/test_pkcs11_high_level.cpp
-+++ b/src/tests/test_pkcs11_high_level.cpp
-@@ -28,10 +28,14 @@
-    #include <botan/der_enc.h>
- #endif
- 
--#if defined (BOTAN_HAS_PUBLIC_KEY_CRYPTO)
-+#if defined(BOTAN_HAS_PUBLIC_KEY_CRYPTO)
-    #include <botan/pubkey.h>
- #endif
- 
-+#if defined(BOTAN_HAS_ECC_GROUP)
-+   #include <botan/ec_group.h>
-+#endif
-+
- #if defined(BOTAN_HAS_RSA) && defined(BOTAN_HAS_PKCS11)
-    #include <botan/rsa.h>
-    #include <botan/p11_rsa.h>
-@@ -909,7 +913,7 @@ BOTAN_REGISTER_TEST("pkcs11-rsa", PKCS11_RSA_Tests);
- 
- /***************************** PKCS11 ECDSA *****************************/
- 
--#if defined(BOTAN_HAS_ECC_GROUP)
-+#if defined(BOTAN_HAS_ECC_GROUP) && (defined(BOTAN_HAS_ECDSA) || defined(BOTAN_HAS_ECDH))
- std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
-    {
-    std::vector<uint8_t> enc;
-diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
-index eaae358420..d9b7858898 100644
---- a/src/tests/unit_x509.cpp
-+++ b/src/tests/unit_x509.cpp
-@@ -603,7 +603,7 @@ Test::Result test_verify_gost2012_cert()
-    {
-    Test::Result result("X509 GOST-2012 certificates");
- 
--#if defined(BOTAN_HAS_GOST_34_10_2012) && defined(BOTAN_HAS_STREEBOG)
-+#if defined(BOTAN_HAS_GOST_34_10_2012) && defined(BOTAN_HAS_STREEBOG) && defined(BOTAN_HAS_EMSA1)
-    try
-       {
-       Botan::X509_Certificate root_cert(Test::data_file("x509/gost/gost_root.pem"));
-@@ -1600,6 +1600,11 @@ class X509_Cert_Unit_Tests final : public Test
-                continue;
- #endif
- 
-+#if !defined(BOTAN_HAS_EMSA1)
-+            if(algo != "RSA" && algo != "Ed25519")
-+               continue;
-+#endif
-+
-             std::unique_ptr<Botan::Private_Key> key = make_a_private_key(algo);
- 
-             if(key == nullptr)
diff --git a/dev-libs/elfutils/elfutils-0.181.ebuild b/dev-libs/elfutils/elfutils-0.181.ebuild
index 80b9641cdabb..2a16a699b49f 100644
--- a/dev-libs/elfutils/elfutils-0.181.ebuild
+++ b/dev-libs/elfutils/elfutils-0.181.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch b/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch
new file mode 100644
index 000000000000..ffb8aae9b1b7
--- /dev/null
+++ b/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch
@@ -0,0 +1,12 @@
+diff -ruN injeqt-1.2.0/CMakeLists.txt injeqt-my/CMakeLists.txt
+--- injeqt-1.2.0/CMakeLists.txt	2017-04-21 11:40:08.000000000 +0200
++++ injeqt-my/CMakeLists.txt	2020-10-14 02:04:12.645803149 +0200
+@@ -37,7 +37,7 @@
+ 	cmake_policy (SET CMP0043 NEW)
+ endif ()
+ 
+-set (WARNINGS "-Werror -W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
++set (WARNINGS "-W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
+ set (VISIBILITY "-fvisibility=hidden -fvisibility-inlines-hidden")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${WARNINGS} ${VISIBILITY}")
+ 
diff --git a/dev-libs/injeqt/injeqt-1.2.0.ebuild b/dev-libs/injeqt/injeqt-1.2.0.ebuild
index 3d9de6be309d..42410678e47c 100644
--- a/dev-libs/injeqt/injeqt-1.2.0.ebuild
+++ b/dev-libs/injeqt/injeqt-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,10 @@ DEPEND="${RDEPEND}
 # https://github.com/vogel/injeqt/issues/18
 RESTRICT=test
 
-PATCHES=( "${FILESDIR}/${P}-gcc7.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gcc7.patch"
+	"${FILESDIR}/${PN}-1.2.0-no-Werror.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 49650f188876..dad5f443f912 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,4 +1 @@
-DIST libdnet-1.12.ipv6-1.patch.gz 5124 BLAKE2B 674866a441a5907df97942772b1e4b95aee004ddb110204df0580cec6b6bb3ba4074831d83e675e1914f1a29281b02227e95016db6ce6a0e8b99417d1aa6aaab SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a
-DIST libdnet-1.12.tar.gz 959945 BLAKE2B a19f8c83425861d02f832330cf0eb5bc317eec157737e0eacd48a7827d423c626b24ce833f66429c9f2a0018502cae5426d5cfc1019aed307d63e4fa6b3845c8 SHA512 a2410a98b76d4bccecf7bcb82ff0b6e9fb809b389f7fea938cc42d94e18622cc5f353d2de737121a1990d9e16e9db8cc2f82677c94f78cd03c9227e815eab9e0
-DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f9676066c15e02c7a8b613e26a5e7743df524869fee2eb7d93438bf346f772b8df199b8ec337279dd50d5d77 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
diff --git a/dev-libs/libdnet/libdnet-1.12-r1.ebuild b/dev-libs/libdnet/libdnet-1.12-r1.ebuild
deleted file mode 100644
index 53b21531ca66..000000000000
--- a/dev-libs/libdnet/libdnet-1.12-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-AT_M4DIR="config"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-inherit autotools distutils-r1
-
-DESCRIPTION="simplified, portable interface to several low-level networking routines"
-HOMEPAGE="https://github.com/dugsong/libdnet"
-SRC_URI="
-	https://github.com/dugsong/libdnet/archive/${P}.tar.gz
-	ipv6? ( https://fragroute-ipv6.googlecode.com/files/${P}.ipv6-1.patch.gz )
-"
-LICENSE="LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 python static-libs test"
-
-DEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	${DEPEND}
-"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-DOCS=( README THANKS TODO )
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	# Useless copy
-	rm -r trunk/ || die
-
-	sed -i \
-		-e 's/libcheck.a/libcheck.so/g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die
-	sed -i -e 's|-L@libdir@ ||g' dnet-config.in || die
-	use ipv6 && eapply "${WORKDIR}/${P}.ipv6-1.patch"
-	sed -i -e '/^SUBDIRS/s|python||g' Makefile.am || die
-	eautoreconf
-
-	if use python; then
-		cd python
-		distutils-r1_src_prepare
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		$(use_with python) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd python
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		cd python
-		unset DOCS
-		distutils-r1_src_install
-	fi
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libdnet/libdnet-1.12.ebuild b/dev-libs/libdnet/libdnet-1.12.ebuild
deleted file mode 100644
index a7cef11fa49a..000000000000
--- a/dev-libs/libdnet/libdnet-1.12.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AT_M4DIR="config"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 eutils ltprune
-
-DESCRIPTION="simplified, portable interface to several low-level networking routines"
-HOMEPAGE="https://github.com/dugsong/libdnet"
-SRC_URI="https://libdnet.googlecode.com/files/${P}.tgz
-	ipv6? ( https://fragroute-ipv6.googlecode.com/files/${P}.ipv6-1.patch.gz )"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="ipv6 python static-libs test"
-
-#DEPEND="test? ( dev-libs/check )"
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( README THANKS TODO )
-
-src_prepare() {
-	# Useless copy
-	rm -r trunk/ || die
-
-	sed -i \
-		-e 's/libcheck.a/libcheck.so/g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die
-	sed -i -e 's|-L@libdir@ ||g' dnet-config.in || die
-	use ipv6 && epatch "${WORKDIR}/${P}.ipv6-1.patch"
-	sed -i -e '/^SUBDIRS/s|python||g' Makefile.am || die
-	eautoreconf
-	if use python; then
-		cd python
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_with python) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd python
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		cd python
-		unset DOCS
-		distutils-r1_src_install
-	fi
-	prune_libtool_files
-}
diff --git a/dev-libs/libdnet/libdnet-1.14-r1.ebuild b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
index 6f45b8bc56cb..aa60351e6e6c 100644
--- a/dev-libs/libdnet/libdnet-1.14-r1.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="python static-libs test"
 
 DEPEND="
diff --git a/dev-libs/libdnet/libdnet-1.14.ebuild b/dev-libs/libdnet/libdnet-1.14.ebuild
deleted file mode 100644
index 3c236abaf8f3..000000000000
--- a/dev-libs/libdnet/libdnet-1.14.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-AT_M4DIR="config"
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_OPTIONAL=1
-inherit autotools distutils-r1
-
-DESCRIPTION="simplified, portable interface to several low-level networking routines"
-HOMEPAGE="https://github.com/ofalk/libdnet"
-SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
-LICENSE="LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="python static-libs test"
-
-DEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	${DEPEND}
-"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-DOCS=( README.md THANKS TODO )
-S=${WORKDIR}/${PN}-${P}
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14-strlcpy.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's/libcheck.a/libcheck.so/g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.ac || die
-	sed -i \
-		-e 's|-L$libdir ||g' \
-		dnet-config.in || die
-	sed -i \
-		-e '/^SUBDIRS/s|python||g' \
-		Makefile.am || die
-
-	eautoreconf
-
-	if use python; then
-		cd python
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_with python) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd python
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		cd python
-		unset DOCS
-		distutils-r1_src_install
-	fi
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index a325aa74693b..a9a0f07eea40 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1 +1,2 @@
 DIST libvoikko-4.3.tar.gz 655465 BLAKE2B a5c0cfd420d51f873bbd707dfddf2e20ea3df8285a88a13fd6a2af947183be42137aefd1ae088b7b01e938864b3fc9402b110cc8a577efb8331a7ea24f795c2e SHA512 804d55d34deca52f882580ff8699a548d0b62d79eb8e27f8f5783a9e0e57d1ab8986963084df2b5fc7ca9f45546e6e4d66e195a42cfbe0327ca02dc211563988
+DIST libvoikko-4.3.tar.gz.asc 833 BLAKE2B 78c8da90512a214ce2060c41f6251c7f7575df59bccb50ae80876de0acd37da56c616e73bcdd83f5962712a9e90fc38817fbd2cd773e4ddb9985f0dc86c7f2bf SHA512 3087e098c3d85ba6419e414ec92af380fedebcab2a8a037b7fc55738f00fe042c9d0de7ec18fb6eb12e3afe2c6e0e8a0bdbcfc55747f0e46268a19158a08fb0b
diff --git a/dev-libs/libvoikko/libvoikko-4.3.ebuild b/dev-libs/libvoikko/libvoikko-4.3.ebuild
index d67f3b790b32..f4f7cb263a7e 100644
--- a/dev-libs/libvoikko/libvoikko-4.3.ebuild
+++ b/dev-libs/libvoikko/libvoikko-4.3.ebuild
@@ -5,16 +5,18 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..8} )
 
-inherit python-r1
+inherit python-r1 verify-sig
 
 DESCRIPTION="Spell checking, hyphenation and morphological analysis tool for Finnish language"
 HOMEPAGE="https://voikko.puimula.org/"
-SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
+	verify-sig? ( https://www.puimula.org/voikko-sources/libvoikko/${P}.tar.gz.asc )"
+
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="+expvfst +hfst"
+IUSE="+expvfst +hfst verify-sig"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -23,6 +25,9 @@ RESTRICT="test"
 DEPEND="${PYTHON_DEPS}
 	hfst? ( >=dev-util/hfstospell-0.5.0 )"
 RDEPEND="${DEPEND}"
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-voikko )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
 
 src_configure() {
 	local myconf=(
diff --git a/dev-libs/libxls/libxls-1.6.1.ebuild b/dev-libs/libxls/libxls-1.6.1.ebuild
index 62b7241386cd..806445dbf160 100644
--- a/dev-libs/libxls/libxls-1.6.1.ebuild
+++ b/dev-libs/libxls/libxls-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/8" # libxlsreader.so.8
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index bae52fdfa2cc..7eccce0b88c9 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1 +1,2 @@
 DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018
+DIST voikko-fi-2.3.tar.gz.asc 833 BLAKE2B 4d960595ac948ec59499448219c5c84fe17060f80bdddaf358d222db63b1c2d167713ff9feec04fa9cbf35072a6cc153486078851319cf6631b7f18b346cd034 SHA512 1990f737673931580236e1765aabc2e47766f0bc1f6fef150fd2fb63dd459244ceb0fef99cea9ba1f1295a75daab0336400b7c6b367f694038849759e000adbc
diff --git a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
index a03999c04843..6fb107e5147f 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit python-any-r1
+inherit python-any-r1 verify-sig
 
 DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)"
 HOMEPAGE="https://voikko.puimula.org/"
-SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
+SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
+	verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/${P}.tar.gz.asc )"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -19,7 +20,10 @@ DEPEND="dev-libs/foma
 	dev-libs/libvoikko"
 RDEPEND="${DEPEND}"
 BDEPEND="${PYTHON_DEPS}
-	dev-libs/libvoikko"
+	dev-libs/libvoikko
+	verify-sig? ( app-crypt/openpgp-keys-voikko )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
 
 src_compile() {
 	emake vvfst
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 4c0a1cd6e84e..b2a0f674bb5d 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch b/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..84af757d248b
--- /dev/null
+++ b/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,7 +107,7 @@
+       include_directories(${LUAJIT_INCLUDE_DIR})
+       link_directories(${LUAJIT_LIBRARIES})
+     else (USE_LUAJIT)
+-      find_package(Lua REQUIRED)
++      find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+       include_directories(${LUA_INCLUDE_DIR})
+     endif (USE_LUAJIT)
+ 
diff --git a/dev-lua/luv/luv-1.32.0.0-r100.ebuild b/dev-lua/luv/luv-1.32.0.0-r100.ebuild
new file mode 100644
index 000000000000..793fb2104a09
--- /dev/null
+++ b/dev-lua/luv/luv-1.32.0.0-r100.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit cmake lua-single unpacker
+
+# e.g. MY_PV = a.b.c-d
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Bare libuv bindings for lua"
+HOMEPAGE="https://github.com/luvit/luv"
+
+LUA_COMPAT_PV="0.7"
+SRC_URI="
+	https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
+"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="${LUA_DEPS}
+	>=dev-libs/libuv-1.32.0:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.32.0.0-cmake_lua_version.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Fix libdir
+	# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
+	sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
+	cmake_src_prepare
+}
+
+# TODO: try to make this multi-impl. Will need at least:
+#  - per-implementation install dirs for headers and the library
+#  - versioned .pc files (which may or may not break revdeps)
+src_configure() {
+	lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
+
+	local mycmakeargs=(
+		-DBUILD_MODULE=OFF
+		-DLUA_BUILD_TYPE=System
+		-DLUA_COMPAT53_DIR="${lua_compat_dir}"
+		-DWITH_SHARED_LIBUV=ON
+	)
+	if [[ ${ELUA} == luajit ]]; then
+		mycmakeargs+=(
+			-DWITH_LUA_ENGINE=LuaJIT
+		)
+	else
+		mycmakeargs+=(
+			-DWITH_LUA_ENGINE=Lua
+			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# We need to copy the library back so that the tests see it
+	ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
+	${ELUA} "tests/run.lua" || die "Tests failed"
+}
diff --git a/dev-lua/messagepack/messagepack-0.3.2-r100.ebuild b/dev-lua/messagepack/messagepack-0.3.2-r100.ebuild
new file mode 100644
index 000000000000..d9897a706c27
--- /dev/null
+++ b/dev-lua/messagepack/messagepack-0.3.2-r100.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua
+
+DESCRIPTION="A pure Lua implementation of the MessagePack serialization format"
+HOMEPAGE="http://fperrad.github.io/lua-MessagePack/"
+SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/lua-${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Requires lua-TestMore, which we currently haven't got in the tree
+RESTRICT=test
+
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+lua_src_install() {
+	local src_postfix=""
+	if [[ ${ELUA} != luajit ]] && $(ver_test $(lua_get_version) -ge 5.3); then
+		src_postfix="5.3"
+	fi
+
+	insinto "$(lua_get_lmod_dir)"
+	doins src${src_postfix}/MessagePack.lua
+}
+
+# nothing to compile
+src_compile() { :; }
+
+src_test() {
+	lua_foreach_impl default
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+	dodoc CHANGES README.md
+}
diff --git a/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua-version.patch b/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua-version.patch
new file mode 100644
index 000000000000..fda6c253c2e6
--- /dev/null
+++ b/dev-lua/toluapp/files/toluapp-1.0.93_p20190513-lua-version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ cmake_minimum_required ( VERSION 2.8 )
+ include ( cmake/dist.cmake )
+ 
+-find_package ( Lua REQUIRED )
++find_package ( Lua ${LUA_VERSION} EXACT REQUIRED )
+ include_directories ( include src/lib ${LUA_INCLUDE_DIR} )
+ 
+ # Build lib
diff --git a/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
new file mode 100644
index 000000000000..ab25d1fac8dc
--- /dev/null
+++ b/dev-lua/toluapp/toluapp-1.0.93_p20190513-r100.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Newer Lua versions are NOT supported, see Bug #508222
+LUA_COMPAT=( lua5-1 )
+
+inherit cmake lua-single
+
+MY_PN=${PN/pp/++}
+COMMIT_ID="b34075b76835b778bb6b2ce0aa224afd9d182887"
+
+DESCRIPTION="A tool to integrate C/C++ code with Lua"
+HOMEPAGE="https://github.com/LuaDist/toluapp"
+SRC_URI="https://github.com/LuaDist/toluapp/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.93_p20190513-fix-multilib.patch
+	"${FILESDIR}"/${PN}-1.0.93_p20190513-lua-version.patch
+)
+CMAKE_REMOVE_MODULES_LIST="dist.cmake lua.cmake FindLua.cmake"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
+	)
+	cmake_src_configure
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 5817dfd52929..4a9812fbf5af 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index 09f0e633b064..b14145bd2580 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -1,3 +1,4 @@
+DIST base-0.14.0.tar.gz 385265 BLAKE2B f3a49b22bb63919bcdc522fbce14a24fd6eaddf39b921ba956cb82eb664ccc6919c9a9feb799dea318f1d8bdf1bd1983180b7ce38d9a43e118794057a9fec6a3 SHA512 c713c9aaf369bc042afb1ead53dc5a34a6eb3c97abc7fef99868e3be8e976adc6297f34d13cfc314adf2182fc64b0cde9c9a05aeeb0f51380255aa1f8e0edf16
 DIST base-0.9.1.tar.gz 286498 BLAKE2B fc2b8b3894af1ee142e5f46f89fbc508aa0a57dd50624598137364f6e6c7bda33864d8131f84838840a86ed8b3dd0d14f3833484c29e6fe3a2ffabefc89cd9e9 SHA512 e1eb26eb07ee3489c8f42a886e2131bcc5eb5e965727eb29910e3aa37cdab6d23bfbf71421e16b77d9fe20a69392f9313ad6189c9618013794f0ed7df8c76c52
 DIST base-0.9.2.tar.gz 286533 BLAKE2B 851472c23c5a79436ee02cf45c0f797de21efbe52b7ca0a9dd8a4244b1808ff9f14b8e364654ebbbfb6d21bd7532f9ee1df0d2728a23154601d4abf69f916dd8 SHA512 9eae093c18e4fcbc02eb970b73bb7e49a94e0ccdd3fd6509d0668035b454ad8b5894bdbd10027a83681e993b4e1dec97db213b7fdfc293cb9737bae303002e11
 DIST base-0.9.3.tar.gz 286655 BLAKE2B 05a53a528a321fb627a2aba1521028b59741ce2de5e24a87cc4a448dedeb788bace907a6d7d49521ff90d56e1c302135dacfa32ff8ab4525e9f0c476fc376bd2 SHA512 7c7ca4439479230a6d338ce51b14c93225b71fd98242f47d82e06c08cbec092a33faa7385db8d21ce0302e7f4f3cf5d659a704e2d85ab3391e046c7d7ea3b62b
diff --git a/dev-ml/base/base-0.14.0.ebuild b/dev-ml/base/base-0.14.0.ebuild
new file mode 100644
index 000000000000..71eb9cb67811
--- /dev/null
+++ b/dev-ml/base/base-0.14.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Standard library for OCaml"
+HOMEPAGE="https://github.com/janestreet/base"
+SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-ml/sexplib0-0.12:=
+	dev-ml/dune-configurator:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/base/metadata.xml b/dev-ml/base/metadata.xml
index 539c455dc3f8..2d3d3fe848fd 100644
--- a/dev-ml/base/metadata.xml
+++ b/dev-ml/base/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/base</remote-id>
 	</upstream>
diff --git a/dev-ml/base_quickcheck/Manifest b/dev-ml/base_quickcheck/Manifest
new file mode 100644
index 000000000000..c6ba569c9cc2
--- /dev/null
+++ b/dev-ml/base_quickcheck/Manifest
@@ -0,0 +1 @@
+DIST base_quickcheck-0.14.0.tar.gz 66736 BLAKE2B eeaa92ec0eec4736be911128f46b8e4698034b2cb8afa131b31ee96a6edb5db0f28cfd611c101e4417305ee5a1babc2f869f4690b266218562a8fc50f5830acf SHA512 52333bee2591531665b8f8ad0fac1cdaa607b448d0a33b9b905cf98e00df5a700bf0a4ee3cdf3c06d7fcb2b5190363dd5908cc743b2854af9ce5c8d743e3fd58
diff --git a/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild b/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild
new file mode 100644
index 000000000000..e83ba35c08c4
--- /dev/null
+++ b/dev-ml/base_quickcheck/base_quickcheck-0.14.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Randomized testing framework, designed for compatibility with Base "
+HOMEPAGE="https://github.com/janestreet/base_quickcheck"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_base:=
+	dev-ml/ppx_fields_conv:=
+	dev-ml/ppx_let:=
+	dev-ml/ppx_sexp_message:=
+	dev-ml/ppx_sexp_value:=
+	dev-ml/splittable_random:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/base_quickcheck/metadata.xml b/dev-ml/base_quickcheck/metadata.xml
new file mode 100644
index 000000000000..9859b7303328
--- /dev/null
+++ b/dev-ml/base_quickcheck/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/base_quickcheck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/bin_prot/Manifest b/dev-ml/bin_prot/Manifest
new file mode 100644
index 000000000000..de449120fb0c
--- /dev/null
+++ b/dev-ml/bin_prot/Manifest
@@ -0,0 +1 @@
+DIST bin_prot-0.14.0.tar.gz 342884 BLAKE2B 9210ca230d9f42ce3dd6ad18e66b62e41eafccf83ac632a988cdc36c16f273076ccdd67ece333acb70e2604180084811319ae41decbd7ef6bba0ee16538c0cae SHA512 7e7bec7dc5ec49b7bc099687a90840620529c36d552e8985b45f2f9a2437396c8b41583081b8c6a75bf3b14bb3ab4db9134cebd12f70f2345c8fa74e1b8fa252
diff --git a/dev-ml/bin_prot/bin_prot-0.14.0.ebuild b/dev-ml/bin_prot/bin_prot-0.14.0.ebuild
new file mode 100644
index 000000000000..1f5c226b5837
--- /dev/null
+++ b/dev-ml/bin_prot/bin_prot-0.14.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Binary protocol generator"
+HOMEPAGE="https://github.com/janestreet/bin_prot"
+SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_compare:=
+	dev-ml/ppx_custom_printf:=
+	dev-ml/ppx_fields_conv:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_variants_conv:=
+	!dev-ml/bin-prot
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/bin_prot/metadata.xml b/dev-ml/bin_prot/metadata.xml
new file mode 100644
index 000000000000..352205a61728
--- /dev/null
+++ b/dev-ml/bin_prot/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/bin_prot</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..1a9969c60bee
--- /dev/null
+++ b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib autotools
+
+DESCRIPTION="Ocaml bindings for the cairo vector graphics library"
+HOMEPAGE="https://www.cairographics.org/cairo-ocaml/"
+SRC_URI="https://cgit.freedesktop.org/cairo-ocaml/snapshot/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gtk pango"
+
+RDEPEND="dev-lang/ocaml:=
+	x11-libs/cairo
+	gtk? ( dev-ml/lablgtk:2= )
+	pango? ( x11-libs/pango )"
+DEPEND="${RDEPEND}"
+
+# 3 patches from debian and one for automagic on libsvg-cairo
+PATCHES=(
+	"${FILESDIR}"/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch \
+	"${FILESDIR}"/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch \
+	"${FILESDIR}"/0003-Fix-FTBFS-on-bytecode-architectures.patch \
+	"${FILESDIR}"/0004-no-automagic.patch
+)
+
+src_prepare() {
+	default
+	has_version '>=dev-lang/ocaml-4.06.0' && eapply "${FILESDIR}"/ocaml406.patch
+	AT_M4DIR=support eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gtk) \
+		$(use_with pango pango-cairo) \
+		--without-svg-cairo
+}
+
+src_compile() {
+	emake -j1
+	use doc && emake doc
+}
+
+src_install() {
+	findlib_src_install
+	dodoc README ChangeLog
+	if use examples; then
+		docinto examples
+		dodoc test/*.ml
+	fi
+	# ocamlfind support
+	cat <<-EOF > META
+		name = "${PN}"
+		description = "${DESCRIPTION}"
+		requires = "bigarray"
+		version = "${PV}"
+		archive(byte) = "cairo.cma"
+		archive(native) = "cairo.cmxa"
+	EOF
+	if use gtk; then
+		cat <<-EOF >> META
+			package "lablgtk2" (
+				requires = "cairo lablgtk2"
+				archive(byte) = "cairo_lablgtk.cma"
+				archive(native) = "cairo_lablgtk.cmxa"
+			)
+		EOF
+	fi
+	if use pango; then
+		cat <<-EOF >> META
+			package "pango" (
+				requires = "cairo"
+				archive(byte) = "pango_cairo.cma"
+				archive(native) = "pango_cairo.cmxa"
+			)
+		EOF
+	fi
+	insinto /usr/$(get_libdir)/ocaml/cairo
+	doins META
+}
diff --git a/dev-ml/cairo-ocaml/files/ocaml406.patch b/dev-ml/cairo-ocaml/files/ocaml406.patch
new file mode 100644
index 000000000000..2ef9931463b0
--- /dev/null
+++ b/dev-ml/cairo-ocaml/files/ocaml406.patch
@@ -0,0 +1,20 @@
+Index: cairo-ocaml-1.2.0/src/cairo_png.ml
+===================================================================
+--- cairo-ocaml-1.2.0.orig/src/cairo_png.ml
++++ cairo-ocaml-1.2.0/src/cairo_png.ml
+@@ -7,13 +7,13 @@
+ (**************************************************************************)
+ 
+ external image_surface_create_from_stream_unsafe : 
+-  (string -> int -> unit) -> Cairo.image_surface = "ml_cairo_image_surface_create_from_png_stream_unsafe"
++  (bytes -> int -> unit) -> Cairo.image_surface = "ml_cairo_image_surface_create_from_png_stream_unsafe"
+ 
+ let image_surface_create_from_channel ic =
+   image_surface_create_from_stream_unsafe
+     (fun s n ->
+       for i = 0 to n - 1 do
+-	String.unsafe_set s i (input_char ic)
++	Bytes.unsafe_set s i (input_char ic)
+       done)
+ 
+ let image_surface_create_from_file fname =
diff --git a/dev-ml/cairo2/Manifest b/dev-ml/cairo2/Manifest
new file mode 100644
index 000000000000..3be8165a41ce
--- /dev/null
+++ b/dev-ml/cairo2/Manifest
@@ -0,0 +1 @@
+DIST cairo2-0.6.1.tbz 90006 BLAKE2B 78f1a998f821aad9b2a1d2deacffd9290920e6d351e0c66b6cc2a6f4f6140fef67c0dde9c1c317e743b5930e09d68d6c1830beb554d23ac9bcc95738a4091850 SHA512 d09274624854a45cf914ffbe984f1bcdd30db6283e7a0fd73aeec2a19226ff8f68d3f7139bbab72ca5698b58b840d6fd8a35570efc228391a7c5d031421f5c1f
diff --git a/dev-ml/cairo2/cairo2-0.6.1.ebuild b/dev-ml/cairo2/cairo2-0.6.1.ebuild
new file mode 100644
index 000000000000..9466d8e1db24
--- /dev/null
+++ b/dev-ml/cairo2/cairo2-0.6.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Binding to Cairo, a 2D Vector Graphics Library"
+HOMEPAGE="https://github.com/Chris00/ocaml-cairo"
+SRC_URI="https://github.com/Chris00/ocaml-cairo/releases/download/${PV}/cairo2-${PV}.tbz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	x11-libs/cairo:=
+	dev-ml/dune-configurator:=
+"
+RDEPEND="${DEPEND}
+	!dev-ml/ocaml-cairo
+"
+BDEPEND=""
+
+# >>> Test phase: dev-ml/cairo2-0.6.1
+# image_create alias tests/runtest (got signal SEGV)
+# (cd _build/default/tests && ./image_create.exe)
+# DESTROY bigarray 'data'
+# Done: 70/72 (jobs: 1) * ERROR: dev-ml/cairo2-0.6.1::x-portage failed (test phase):
+RESTRICT=test
+
+# Fix compiler warnings, from: https://github.com/Chris00/ocaml-cairo/pull/22
+PATCHES=( "${FILESDIR}"/${PN}-0.6.1-handle-safe-string.patch )
diff --git a/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch b/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch
new file mode 100644
index 000000000000..8571da4ea9fe
--- /dev/null
+++ b/dev-ml/cairo2/files/cairo2-0.6.1-handle-safe-string.patch
@@ -0,0 +1,50 @@
+commit 9881f6c861ccf1150fffd6ccdb8b93181ad14263 (HEAD -> const, origin/const)
+Author: Olaf Hering <olaf@aepfle.de>
+Date:   Fri Jul 17 15:47:59 2020 +0200
+
+    handle safe-string
+    
+    String_val() returns 'const char *'.
+    caml_named_value returns 'const value *'.
+    
+    Signed-off-by: Olaf Hering <olaf@aepfle.de>
+
+diff --git a/src/cairo_macros.h b/src/cairo_macros.h
+index d952c10..1348b27 100644
+--- a/src/cairo_macros.h
++++ b/src/cairo_macros.h
+@@ -173,7 +173,7 @@
+ 
+ /* holds the pointer to the Unavailable exception; shared several
+    functions. */
+-value * caml_cairo_Unavailable = NULL;
++const value * caml_cairo_Unavailable = NULL;
+ 
+ #define RAISE_UNAVAILABLE(name, args ...)                               \
+   CAMLexport value caml_##name(args)                                    \
+diff --git a/src/cairo_ocaml_types.h b/src/cairo_ocaml_types.h
+index b850ae2..267f657 100644
+--- a/src/cairo_ocaml_types.h
++++ b/src/cairo_ocaml_types.h
+@@ -45,7 +45,7 @@ DEFINE_CUSTOM_OPERATIONS(cairo, cairo_destroy, CAIRO_VAL)
+ /* raise [Error] if the status indicates a failure. */
+ void caml_cairo_raise_Error(cairo_status_t status)
+ {
+-  static value * exn = NULL;
++  static const value * exn = NULL;
+ 
+   if (status != CAIRO_STATUS_SUCCESS) {
+     if (exn == NULL) {
+diff --git a/src/cairo_stubs.c b/src/cairo_stubs.c
+index de35aca..597c0bf 100644
+--- a/src/cairo_stubs.c
++++ b/src/cairo_stubs.c
+@@ -1681,7 +1681,7 @@ static cairo_status_t caml_cairo_output_string
+   CAMLlocal2(s, r);
+ 
+   s = caml_alloc_string(length);
+-  memmove(String_val(s), data, length);
++  memmove(&Byte(String_val(s), 0), data, length);
+   r = caml_callback_exn(* ((value *) fn), s);
+   if (Is_exception_result(r))
+     CAMLreturn(CAIRO_STATUS_WRITE_ERROR);
diff --git a/dev-ml/cairo2/metadata.xml b/dev-ml/cairo2/metadata.xml
new file mode 100644
index 000000000000..f3c04171cc2c
--- /dev/null
+++ b/dev-ml/cairo2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Chris00/ocaml-cairo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild b/dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..cd213ca3e52e
--- /dev/null
+++ b/dev-ml/camlbz2/camlbz2-0.6.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="OCaml bindings for libbz (AKA, bzip2)"
+HOMEPAGE="http://camlbz2.forge.ocamlcore.org/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/72/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="doc"
+
+DEPEND="app-arch/bzip2
+	>=dev-lang/ocaml-3.12:=[ocamlopt]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake -j1
+}
+
+DOCS=( ChangeLog README ROADMAP BUGS )
+HTML_DOCS=( doc/. )
+
+src_install() {
+	findlib_src_preinst
+	emake DESTDIR="${OCAMLFIND_DESTDIR}" install
+	use doc && einstalldocs
+}
diff --git a/dev-ml/camlbz2/metadata.xml b/dev-ml/camlbz2/metadata.xml
index 6f49eba8f496..a4f6be63adba 100644
--- a/dev-ml/camlbz2/metadata.xml
+++ b/dev-ml/camlbz2/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>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index cc8bcfc4f3e0..5a0713d643b4 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -1,3 +1,5 @@
 DIST camlp4-4.04_p1.tar.gz 648320 BLAKE2B d383a366facaaa440b24184bb54a8e1c3bb22ae02387a0bc4f9ee4331ecdc60e5bf22715c1022c987041fb081eb448794a74026736df9f70e05c7213e08bfa44 SHA512 7db8eebcf3d230f60650ba62d9cb630c069394237e97b678a40b61d3dcaded752a2b7e089a50ff528f1ea0740d0291b722df123a072f2cee489cadc5201c6776
 DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854 SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
 DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515 SHA512 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
+DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e SHA512 7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
+DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
index 83ae5d4e9cd0..dd82d7f3b238 100644
--- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
@@ -16,9 +16,7 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~
 IUSE="+ocamlopt"
 
 DEPEND="=dev-lang/ocaml-4.04*:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	!<dev-lang/ocaml-4.02
-	!<dev-ml/findlib-1.5.5-r1"
+RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
 
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
index 21115c507003..d59f89100ed6 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
@@ -16,9 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-li
 IUSE="+ocamlopt"
 
 DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	!<dev-lang/ocaml-4.02
-	!<dev-ml/findlib-1.5.5-r1"
+RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
 
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
index 3c23ad7767da..b78571d66663 100644
--- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
@@ -16,9 +16,7 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	!<dev-lang/ocaml-4.02
-	!<dev-ml/findlib-1.5.5-r1"
+RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
 
diff --git a/dev-ml/camlp4/camlp4-4.10_p1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1.ebuild
new file mode 100644
index 000000000000..b80025c98baa
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.10_p1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/camlp4/camlp4"
+SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.10.0:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-ml/ocamlbuild"
+
+S=${WORKDIR}/${P/_p/-}
+PATCHES=( "${FILESDIR}/reload.patch" )
+
+src_configure() {
+	./configure \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="$(ocamlc -where)" \
+		--pkgdir="$(ocamlc -where)" \
+		|| die
+}
+
+src_compile() {
+	# Increase stack limit to 11GiB to avoid stack overflow error.
+	ulimit -s 11530000
+	emake byte
+	use ocamlopt && emake native
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-META
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/camlp4/camlp4-4.11_p1.ebuild b/dev-ml/camlp4/camlp4-4.11_p1.ebuild
new file mode 100644
index 000000000000..dea97b226afc
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.11_p1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/camlp4/camlp4"
+SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.11.0:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-ml/ocamlbuild"
+
+S=${WORKDIR}/${P/_p/-}
+PATCHES=( "${FILESDIR}/reload.patch" )
+
+src_configure() {
+	./configure \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="$(ocamlc -where)" \
+		--pkgdir="$(ocamlc -where)" \
+		|| die
+}
+
+src_compile() {
+	# Increase stack limit to 11GiB to avoid stack overflow error.
+	ulimit -s 11530000
+	emake byte
+	use ocamlopt && emake native
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-META
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/camlp4/metadata.xml b/dev-ml/camlp4/metadata.xml
index 33d51779cb3d..2578754c2469 100644
--- a/dev-ml/camlp4/metadata.xml
+++ b/dev-ml/camlp4/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">camlp4/camlp4</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">camlp4/camlp4</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 88a996b85b6d..f99200f89122 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -1 +1,2 @@
 DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720470a0a33f99fc61a1ce7b4a9d494ffe6b523c74906c122ee04ae25a08bf1fcd356145e85a11e3e3095bbf7d SHA512 109a43f0a3aaa7a3ba9bd51b1fc1273b054d32787e189b138d69b39c42642b480c13abb9e91f15e6b6e889eaf4dc422ad3ff51e4dee298fb9d8cd9a2db99c159
+DIST camlp5-7.12.tar.gz 1008350 BLAKE2B 8f390f6d617a6ef029462aa74ca4d80c0e2eb267bb6957aac43fdecc425aae34dfc7f3e572c8a1f4ee6b032dd90b3b8262094f80a19ea0bb19b80a88d22d3f28 SHA512 233d973b0a968a7812b977e8a37da8e8daa0f3ef81ca7c473d83c1602380dae6c14f94daffb6bb799f8d90fab121238a46e89a233202cd6f622b0da2f728c0c0
diff --git a/dev-ml/camlp5/camlp5-7.12.ebuild b/dev-ml/camlp5/camlp5-7.12.ebuild
new file mode 100644
index 000000000000..59d3a95dc7e3
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-7.12.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib vcs-clean
+
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="doc +ocamlopt"
+
+DEPEND="
+	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-7.12-destdir.patch" )
+
+camlp5_hack_ocaml_support() {
+	ln -s "${1}"    "ocaml_stuff/${2}"              || die
+	ln -s "${1}.ml" "ocaml_src/lib/versdep/${2}.ml" || die
+}
+
+src_prepare() {
+	egit_clean
+	default
+	camlp5_hack_ocaml_support 4.11.0 4.11.1
+}
+
+src_configure() {
+	./configure \
+		--strict \
+		-prefix /usr \
+		-bindir /usr/bin \
+		-libdir /usr/$(get_libdir)/ocaml \
+		-mandir /usr/share/man || die "configure failed"
+}
+
+src_compile(){
+	emake out
+	if use ocamlopt; then
+		emake  opt
+		emake  opt.opt
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# findlib support
+	insinto "$(ocamlfind printconf destdir)/${PN}"
+	doins etc/META
+
+	dodoc -r doc/*
+	dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE
+}
diff --git a/dev-ml/camlp5/files/camlp5-7.12-destdir.patch b/dev-ml/camlp5/files/camlp5-7.12-destdir.patch
new file mode 100644
index 000000000000..d43a29c97d3f
--- /dev/null
+++ b/dev-ml/camlp5/files/camlp5-7.12-destdir.patch
@@ -0,0 +1,13 @@
+Index: camlp5-rel712/Makefile
+===================================================================
+--- camlp5-rel712.orig/Makefile
++++ camlp5-rel712/Makefile
+@@ -57,7 +57,7 @@ install:
+ 	for i in $(DIRS) compile; do \
+ 	  (cd $$i; $(MAKE) install DESTDIR=$(DESTDIR); cd ..); \
+ 	done
+-	cp etc/topfind.camlp5 `ocamlc -where`/. || true
++	cp etc/topfind.camlp5 "$(DESTDIR)`ocamlc -where`/." || true
+ 
+ uninstall:
+ 	@if test -z "$(LIBDIR)"; then \
diff --git a/dev-ml/camlp5/metadata.xml b/dev-ml/camlp5/metadata.xml
index 7994efd51d47..cafe415ffc77 100644
--- a/dev-ml/camlp5/metadata.xml
+++ b/dev-ml/camlp5/metadata.xml
@@ -5,6 +5,10 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">camlp5/camlp5</remote-id>
 	</upstream>
diff --git a/dev-ml/cinaps/Manifest b/dev-ml/cinaps/Manifest
new file mode 100644
index 000000000000..1d75851eb9b6
--- /dev/null
+++ b/dev-ml/cinaps/Manifest
@@ -0,0 +1 @@
+DIST cinaps-0.14.0.tar.gz 9602 BLAKE2B 01d71b199dc966ac7653aca31d8a2e238102a5a29c4b6a1cf2ddd3f4624b41a4fd3e433025217951e7bd49b5eba21b6e4462217ef65a8755e6a4075683a55c5e SHA512 03f94ce7ab16d034edfc1976dd8fb83d533a1e5bc7f89dde3ea661553e05d6d8098c62c7e154013ef7814a283bb8cf535df0256891bcc6e0fdc847f6bf62aaf9
diff --git a/dev-ml/cinaps/cinaps-0.14.0.ebuild b/dev-ml/cinaps/cinaps-0.14.0.ebuild
new file mode 100644
index 000000000000..aeb08474dbf2
--- /dev/null
+++ b/dev-ml/cinaps/cinaps-0.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Trivial metaprogramming tool"
+HOMEPAGE="https://github.com/ocaml-ppx/cinaps"
+SRC_URI="https://github.com/ocaml-ppx/cinaps/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-ml/re:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/ppx_jane
+		)
+"
diff --git a/dev-ml/cinaps/metadata.xml b/dev-ml/cinaps/metadata.xml
new file mode 100644
index 000000000000..c68adc6e3a7f
--- /dev/null
+++ b/dev-ml/cinaps/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml-ppx/cinaps</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest
index a40ae258b02c..45367a4a50d6 100644
--- a/dev-ml/cmdliner/Manifest
+++ b/dev-ml/cmdliner/Manifest
@@ -1,3 +1,4 @@
 DIST cmdliner-1.0.0.tbz 46542 BLAKE2B 7a667e218c298dbe4f5ba8ff034f15596e9b89b1a267fbdf7f6f811e42d61b103b08a2c8b9bd45e83bb249ae5ed078eb646630cd8a174af267354b25dc13ca54 SHA512 3fc87e49504167864ba4d81fde7bbaa01b7d58b06e2b68b36647857590f41fdc8b3bbd547418f8159b0e76628236b5c30301404b3d8d57e2ff3f082228eee73c
 DIST cmdliner-1.0.1.tbz 46614 BLAKE2B 609220b8dbb0aa5ade9f504f420ed7c6ee1ad9aa1f9cd02b1edba60b86791e59a12faca0ebe6ed9cbb5fbeefdfe25b524509bf311f1611022b6c62ae38df01c1 SHA512 b792dab3a7f53f69d74d07acbb013e48235614e29a477b7e9e7d7b58013d47ff842fbaeef50acda305434185325855ef83d839d5acb0ccf460276f0ca880ee7b
 DIST cmdliner-1.0.2.tbz 47350 BLAKE2B 226481c73e66fb45a69b563bef9f95c6a04b782072643fd8e66e4da4907f899a72e2b4e1217b46c3a1f417bf9e4be193c3528da09954808043e4abf47be4d5c2 SHA512 d718d9abe4fe0ea0e7453ed09e57de2a427cc450225cf2b56513d99af4b4218c3fe96ab08dcebd202b9ecf25a471bb7c67511262f35148dfe15684421be6d743
+DIST cmdliner-1.0.4.tbz 49558 BLAKE2B 8ea922a22d08fc4cce6c0aff1adff9a2fcdaee8e13b7bdfad4a08b459e8a6557761fa70c9e34100bc8baaa4113e5729f2daf297fc1f618bd8c30b9323bb87ba2 SHA512 4cd1cc0932b8bbd607160cc9816b35c12a68a358a35ffcb6827f547052dc517e871a91ddbaed0447cb1fa5fdf510cdf5d760e8e5c1e4548f82e1d523e2b3ecb3
diff --git a/dev-ml/cmdliner/cmdliner-1.0.4.ebuild b/dev-ml/cmdliner/cmdliner-1.0.4.ebuild
new file mode 100644
index 000000000000..f6e0b62888f8
--- /dev/null
+++ b/dev-ml/cmdliner/cmdliner-1.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="Declarative definition of command line interfaces for OCaml"
+HOMEPAGE="http://erratique.ch/software/cmdliner"
+SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4:=[ocamlopt?]
+	dev-ml/result:=
+	dev-ml/findlib:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/topkg
+	dev-ml/ocamlbuild"
+
+src_compile() {
+	ocaml pkg/pkg.ml build \
+		--tests $(usex test true false) \
+		|| die
+}
+
+src_test() {
+	ocaml pkg/pkg.ml test || die
+}
+
+src_install() {
+	# Can't use opam-installer here as it is an opam dep...
+	findlib_src_preinst
+	local nativelibs=""
+	use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
+	ocamlfind install cmdliner _build/pkg/META \
+		_build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
+	dodoc README.md CHANGES.md
+}
diff --git a/dev-ml/cmdliner/metadata.xml b/dev-ml/cmdliner/metadata.xml
index 6f49eba8f496..a4f6be63adba 100644
--- a/dev-ml/cmdliner/metadata.xml
+++ b/dev-ml/cmdliner/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>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/cppo/Manifest b/dev-ml/cppo/Manifest
index 73332ee2ac20..410e4a1dd11f 100644
--- a/dev-ml/cppo/Manifest
+++ b/dev-ml/cppo/Manifest
@@ -1,2 +1,3 @@
 DIST cppo-1.4.1.tar.gz 26547 BLAKE2B a93802fb36cfb622de32a00f6ad6d0fbc7c1022a65ab70558273654b817ca16a988fb8ce8c5dd0751e80eef066f3fcb82f25fc572edb312f346cd20830c08f5a SHA512 efbc82d2eb31b9e16c43ffbd7a2a56a5356934c32bee62205f55295a9342e4747ce13b9ad6572f3180e656b215a9255d402712ff7bae1ef9e8eccdabb2d00c16
 DIST cppo-1.5.0.tar.gz 26963 BLAKE2B 4118637bd8bcfc2edae4c7bf0d839b82ba3402c2f4df9de81bcb28685e4112ff364cb607dc9dcdc3512cc4fdf8dfb4cb85ceca945230bd7cd5d04e525d4e6587 SHA512 2cc144815b818242b6bb1dee213aa65345620eaf1afe59b25d118399d9a02d577aa9dc61dd5756661e44411acccdb2fc0320a8984e5f0d2a7390fcc816bac7e0
+DIST cppo-1.6.6.tar.gz 28667 BLAKE2B 57510ff824265065d4c4ba7d3da4b9aea389e005de4f2e73c1b43b230082872be0118e0b40d6c2951d4017210522a06eb089ab5cbb18fb48d29b87736fa59055 SHA512 80b0d7a5f0f5b7d9d62ddfb204ebf5e3216c2926ba7f667b9ef10981de6a51cd6d670b7062769bf6fbdd163c1c8fb5426a74c31234ddc03ec94a75645bf469da
diff --git a/dev-ml/cppo/cppo-1.6.6.ebuild b/dev-ml/cppo/cppo-1.6.6.ebuild
new file mode 100644
index 000000000000..096dc5984fc0
--- /dev/null
+++ b/dev-ml/cppo/cppo-1.6.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="An equivalent of the C preprocessor for OCaml programs"
+HOMEPAGE="https://github.com/ocaml-community/cppo/"
+SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/${PV}"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="+ocamlopt"
+
+RDEPEND="dev-ml/ocamlbuild"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/cppo/metadata.xml b/dev-ml/cppo/metadata.xml
index 01532e5edac5..7ef499b5a200 100644
--- a/dev-ml/cppo/metadata.xml
+++ b/dev-ml/cppo/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">mjambon/cppo</remote-id>
+		<remote-id type="github">ocaml-community/cppo</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/csexp/Manifest b/dev-ml/csexp/Manifest
new file mode 100644
index 000000000000..452d02513530
--- /dev/null
+++ b/dev-ml/csexp/Manifest
@@ -0,0 +1 @@
+DIST csexp-1.3.2.tbz 9775 BLAKE2B b1afea15558a5520abab214874653e9768ebbb22e064b51dab2f5bd5543460e357f9e1cba964341bcb24c5d53d8477de5458186e4d83db21d99a8ca45009d818 SHA512 ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026
diff --git a/dev-ml/csexp/csexp-1.3.2.ebuild b/dev-ml/csexp/csexp-1.3.2.ebuild
new file mode 100644
index 000000000000..1ed79067c904
--- /dev/null
+++ b/dev-ml/csexp/csexp-1.3.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Parsing and printing of S-expressions in Canonical form"
+HOMEPAGE="https://github.com/ocaml-dune/csexp"
+SRC_URI="https://github.com/ocaml-dune/csexp/releases/download/${PV}/${P}.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+DEPEND="${DEPEND}
+	test? ( dev-ml/ppx_expect )
+"
diff --git a/dev-ml/csexp/metadata.xml b/dev-ml/csexp/metadata.xml
new file mode 100644
index 000000000000..f197dd418645
--- /dev/null
+++ b/dev-ml/csexp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml-dune/csexp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index ab42e9125e18..1eb1b7a575bb 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1 +1,2 @@
 DIST cudf-0.8.tar.gz 55147 BLAKE2B c091a55e438979f73bfd5fd16f1e793ec984b24becc902e6eed856afea0f39586001174847b8626bbf162c2b51cbb98cdb60d9539c9aac0a1d651b693e686704 SHA512 cea9e51094076089b1beb657f6b2ccc6ac5f49660e06743f8ec646b277beb4c830f90156ae240a6903de55d09caee78fb0dc75efd76ca65fd2b40ab8756301e3
+DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
diff --git a/dev-ml/cudf/cudf-0.9.ebuild b/dev-ml/cudf/cudf-0.9.ebuild
new file mode 100644
index 000000000000..5ad0b0237b4a
--- /dev/null
+++ b/dev-ml/cudf/cudf-0.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
+HOMEPAGE="http://www.mancoosi.org/cudf/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/36602/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/extlib:=
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit2 )
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+	dev-lang/perl
+"
+PATCHES=( "${FILESDIR}/ounit2.patch" )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|make|$(MAKE)|g' \
+		Makefile || die
+	sed -i \
+		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
+		c-lib/Makefile || die
+	sed -i \
+		-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
+		c-lib/Makefile.variants || die
+
+	tc-export CC PKG_CONFIG
+
+	sed -i \
+		-e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \
+		c-lib/cudf.pc.in || die
+}
+
+src_compile() {
+	emake OCAMLBUILD="ocamlbuild -classic-display" -j1 all
+	emake OCAMLBUILD="ocamlbuild -classic-display" c-lib
+	if use ocamlopt ; then
+		emake OCAMLBUILD="ocamlbuild -classic-display" -j1 opt
+		emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-opt
+	fi
+}
+
+src_test() {
+	emake OCAMLBUILD="ocamlbuild -classic-display" test
+	emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-test
+}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+	dodoc BUGS ChangeLog README TODO
+}
diff --git a/dev-ml/cudf/files/ounit2.patch b/dev-ml/cudf/files/ounit2.patch
new file mode 100644
index 000000000000..5fbedbf26edf
--- /dev/null
+++ b/dev-ml/cudf/files/ounit2.patch
@@ -0,0 +1,12 @@
+Index: cudf-0.9/_tags
+===================================================================
+--- cudf-0.9.orig/_tags
++++ cudf-0.9/_tags
+@@ -1,5 +1,5 @@
+-<test.ml> or <tests.ml> : pkg_oUnit
+-<test.byte> or <test.native> : pkg_oUnit
++<test.ml> or <tests.ml> : pkg_ounit2
++<test.byte> or <test.native> : pkg_ounit2
+ 
+ <*.ml> or <*.mli> : pkg_extlib
+ <*.byte> or <*.native> : pkg_extlib
diff --git a/dev-ml/cudf/metadata.xml b/dev-ml/cudf/metadata.xml
index 6f49eba8f496..a4f6be63adba 100644
--- a/dev-ml/cudf/metadata.xml
+++ b/dev-ml/cudf/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>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/dose3/dose3-5.0.1-r1.ebuild b/dev-ml/dose3/dose3-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..d51c16a8f83f
--- /dev/null
+++ b/dev-ml/dose3/dose3-5.0.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_beta/-beta}"
+DESCRIPTION="Library to perform analysis on package repositories"
+HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/36063/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test"
+
+RDEPEND="
+	>=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/cudf:=
+	>=dev-ml/extlib-1.7.0:=
+	dev-ml/re:=
+	parmap? ( dev-ml/parmap:= )
+	zip? ( dev-ml/camlzip:= )
+	bzip2? ( dev-ml/camlbz2:= )
+	>=dev-ml/ocamlgraph-1.8.6:=
+	xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= )
+	curl? ( dev-ml/ocurl:= )
+	rpm4? ( app-arch/rpm )
+"
+DEPEND="${RDEPEND}
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+	dev-ml/cppo
+	test? ( dev-python/pyyaml[libyaml] )
+"
+# missing test data
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die
+	has_version '>=dev-lang/ocaml-4.06_beta' && eapply "${FILESDIR}/ocaml406.patch"
+	eapply "${FILESDIR}/unix.patch"
+}
+
+src_configure() {
+	econf \
+		$(use ocamlopt || echo "--with-bytecodeonly") \
+		$(use parmap && echo "--with-parmap") \
+		$(use zip && echo "--with-zip") \
+		$(use bzip2 && echo "--with-bz2") \
+		$(use xml && echo "--with-xml") \
+		$(use curl && echo "--with-curl") \
+		$(use rpm4 && echo "--with-rpm4")
+}
+
+src_compile() {
+	emake -j1 VERBOSE="-classic-display"
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install || die
+	dodoc CHANGES CREDITS README.architecture TODO
+}
diff --git a/dev-ml/dose3/files/ocaml406.patch b/dev-ml/dose3/files/ocaml406.patch
new file mode 100644
index 000000000000..867c2ca4848c
--- /dev/null
+++ b/dev-ml/dose3/files/ocaml406.patch
@@ -0,0 +1,39 @@
+Index: dose3-5.0.1/common/criteria_lexer.mll
+===================================================================
+--- dose3-5.0.1.orig/common/criteria_lexer.mll
++++ dose3-5.0.1/common/criteria_lexer.mll
+@@ -18,7 +18,7 @@
+     let c = Lexing.lexeme_char lexbuf 2 in (* the delimiter can be any character *)
+     (* find the terminating delimiter *)
+     let endpos =
+-      try String.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
++      try Bytes.index_from lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) c with
+       |Invalid_argument _ ->
+           raise (Format822.Syntax_error (
+             Format822.error lexbuf "String too short"))
+@@ -27,9 +27,9 @@
+             Format822.error lexbuf (Printf.sprintf "cannot find: %c" c)))
+     in
+     let len = endpos - (lexbuf.lex_start_pos + 3) in
+-    let s = String.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
+-    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((String.length s)+4);
+-    s
++    let s = Bytes.sub lexbuf.lex_buffer (lexbuf.lex_start_pos + 3) len in
++    lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_start_pos + ((Bytes.length s)+4);
++    Bytes.to_string s
+ 
+ }
+ 
+Index: dose3-5.0.1/common/input.ml
+===================================================================
+--- dose3-5.0.1.orig/common/input.ml
++++ dose3-5.0.1/common/input.ml
+@@ -47,7 +47,7 @@ let bzip_open_file file =
+   in
+   IO.create_in
+   ~read:(fun () -> input_char ch)
+-  ~input:(read ch)
++  ~input:(fun x -> read ch (Bytes.to_string x))
+   ~close:(fun () -> Bz2.close_in ch)
+ #else
+     fatal "bzip not supported. re-configure with --with-bz2"
diff --git a/dev-ml/dose3/files/unix.patch b/dev-ml/dose3/files/unix.patch
new file mode 100644
index 000000000000..c3dbfabcfbce
--- /dev/null
+++ b/dev-ml/dose3/files/unix.patch
@@ -0,0 +1,13 @@
+Index: dose3-5.0.1/META.in
+===================================================================
+--- dose3-5.0.1.orig/META.in
++++ dose3-5.0.1/META.in
+@@ -8,7 +8,7 @@ package "common" (
+ version = "@PACKAGE_VERSION@"
+ archive(byte) = "common.cma"
+ archive(native) = "common.cmxa"
+-requires = "extlib, re.pcre, cudf, @ZIP@, @BZ2@"
++requires = "extlib, re.pcre, cudf, unix, @ZIP@, @BZ2@"
+ )
+ 
+ package "algo" (
diff --git a/dev-ml/dose3/metadata.xml b/dev-ml/dose3/metadata.xml
index 35cab394ef66..99daf30cfd99 100644
--- a/dev-ml/dose3/metadata.xml
+++ b/dev-ml/dose3/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<use>
 		<flag name="parmap">Adds multi-core CPU support via <pkg>dev-ml/parmap</pkg>.</flag>
 		<flag name="zip">Adds support for handling zip files.</flag>
diff --git a/dev-ml/dune-configurator/Manifest b/dev-ml/dune-configurator/Manifest
new file mode 100644
index 000000000000..3a2231dc56b8
--- /dev/null
+++ b/dev-ml/dune-configurator/Manifest
@@ -0,0 +1 @@
+DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
diff --git a/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild
new file mode 100644
index 000000000000..0033b8430bb6
--- /dev/null
+++ b/dev-ml/dune-configurator/dune-configurator-2.7.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+
+DEPEND="
+	dev-ml/dune-private-libs:=
+	dev-ml/csexp:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/ppx_expect
+		)"
+S=${WORKDIR}/dune-${PV}
+
+src_configure(){
+	:
+}
diff --git a/dev-python/args/metadata.xml b/dev-ml/dune-configurator/metadata.xml
similarity index 51%
rename from dev-python/args/metadata.xml
rename to dev-ml/dune-configurator/metadata.xml
index d0d9dfb92744..6b935772818b 100644
--- a/dev-python/args/metadata.xml
+++ b/dev-ml/dune-configurator/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="pypi">args</remote-id>
-		<remote-id type="github">kennethreitz-archive/args</remote-id>
+		<remote-id type="github">ocaml/dune</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/dune-private-libs/Manifest b/dev-ml/dune-private-libs/Manifest
new file mode 100644
index 000000000000..3a2231dc56b8
--- /dev/null
+++ b/dev-ml/dune-private-libs/Manifest
@@ -0,0 +1 @@
+DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
new file mode 100644
index 000000000000..671f7df54655
--- /dev/null
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> dune-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-ml/csexp:=
+	dev-ml/findlib:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/ppx_expect
+		)"
+S=${WORKDIR}/dune-${PV}
+
+src_prepare() {
+	default
+	# remove tests that run git
+	rm -f \
+		test/blackbox-tests/test-cases/dune-project-meta/main.t/run.t \
+		test/blackbox-tests/test-cases/meta-template-version-bug.t \
+		test/blackbox-tests/test-cases/subst.t/run.t \
+		test/expect-tests/vcs_tests.ml \
+		|| die
+}
+
+src_configure(){
+	:
+}
diff --git a/dev-ml/dune-private-libs/metadata.xml b/dev-ml/dune-private-libs/metadata.xml
new file mode 100644
index 000000000000..6b935772818b
--- /dev/null
+++ b/dev-ml/dune-private-libs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/dune</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 0d61b49a65c3..95ed327cc58d 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -1 +1,2 @@
 DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e82815f93ad727079da00b8592d219e7664c93bed7b97b3a1e997306d60672b7d6c45fe6dae7371b4025df06722 SHA512 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f
+DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
diff --git a/dev-ml/dune/dune-2.7.1.ebuild b/dev-ml/dune/dune-2.7.1.ebuild
new file mode 100644
index 000000000000..5f9e9851d52e
--- /dev/null
+++ b/dev-ml/dune/dune-2.7.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+DEPEND="dev-lang/ocaml"
+RDEPEND="${DEPEND}
+	!dev-ml/jbuilder"
+BDEPEND=""
+
+RESTRICT="test"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	ocaml bootstrap.ml || die
+	./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) || die
+}
+
+src_install() {
+	default
+	mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF}
+	mv "${D}"/usr/man "${D}"/usr/share/man
+}
diff --git a/dev-ml/dune/metadata.xml b/dev-ml/dune/metadata.xml
index 4e0f053007ed..6b935772818b 100644
--- a/dev-ml/dune/metadata.xml
+++ b/dev-ml/dune/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ocaml/dune</remote-id>
 	</upstream>
diff --git a/dev-ml/extlib/Manifest b/dev-ml/extlib/Manifest
index 2098ac0736a8..f20093a16fb5 100644
--- a/dev-ml/extlib/Manifest
+++ b/dev-ml/extlib/Manifest
@@ -1,3 +1,4 @@
 DIST extlib-1.7.1.tar.gz 85397 BLAKE2B f2e924f651cc43ca29914c95400a26bfd062ecb4e7379d169533d394497215906b56e8f57ba29358965f0b8c125c33dcb9a0a95c09488404fd348261d075457f SHA512 42ea1be22a57ab31e5857df0c4c0f98a07e1b5958b34181cd5ab7c83ded112c208315d22cd3dd178d53e75ca109a70cb47ae479e95be8c47ea2087b1a158dc4d
 DIST extlib-1.7.2.tar.gz 85934 BLAKE2B fab7f5f99be414a83f46144bc8f2f54aeb545ef9041b62f227f9dafd267a3f8608b94388ffc39903b069ec7d481b4da8a6a2e9aa289c68263613cf64aa6a45e0 SHA512 d9f34f5bbd5e94a8dccc5bdbc1ec0e5015608675469c4f513461fa587a5eb7e1398542388fd885d7656591ca85ce30c0e2a9ee26b9722a9dd65189aac35d64ed
 DIST extlib-1.7.6.tar.gz 88068 BLAKE2B 32376c09728ec7e7d762888ad706641b94bcc976f2e1f42f246ba79fe862b60df7ff924e1e22e89333d8f2e1d999deb71eee481c3c5919aa5d1e02731f64f323 SHA512 3065e2474fb0e480ed076aa1156584a4a6c839cd5d9e59f341e41113abb1736241354aa7ee7cb492967698bc392969522fd5bf30d1ad7f94754c4e10f376afa8
+DIST extlib-1.7.7.tar.gz 88870 BLAKE2B fff84524ef227718d3908c5b65f4b781360cebc0dca3a8862aa11ea671499b45192c5106769e104d396118e3cdcd904ddce06df784f8fd0eadb7a2372ca3df94 SHA512 088a6c5bbe6530cd60e2276dc02592b69ad7ad685b752f0544c54b6246b8131238c6423ce7bfc81fe3ad1766f605ecf52fd3888d55cca63e22c947afedf610c5
diff --git a/dev-ml/extlib/extlib-1.7.7.ebuild b/dev-ml/extlib/extlib-1.7.7.ebuild
new file mode 100644
index 000000000000..ff4c64b84664
--- /dev/null
+++ b/dev-ml/extlib/extlib-1.7.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib vcs-clean
+
+DESCRIPTION="Standard library extensions for O'Caml"
+HOMEPAGE="https://github.com/ygrek/ocaml-extlib"
+SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc +ocamlopt"
+
+RDEPEND="
+	dev-lang/ocaml:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}
+	dev-ml/cppo"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.7-no-git.patch
+	)
+
+S="${WORKDIR}/ocaml-${P}"
+
+src_prepare() {
+	default
+	egit_clean
+}
+
+src_compile() {
+	cd src || die
+	emake -j1 all
+	if use ocamlopt; then
+		emake opt cmxs
+	fi
+
+	if use doc; then
+		emake doc
+	fi
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	findlib_src_install
+
+	# install documentation
+	dodoc README.md
+
+	if use doc; then
+		dodoc -r src/doc/
+	fi
+}
diff --git a/dev-ml/extlib/files/extlib-1.7.7-no-git.patch b/dev-ml/extlib/files/extlib-1.7.7-no-git.patch
new file mode 100644
index 000000000000..058543455bce
--- /dev/null
+++ b/dev-ml/extlib/files/extlib-1.7.7-no-git.patch
@@ -0,0 +1,9 @@
+--- ocaml-extlib-1.7.7-orig/Makefile	2020-04-25 07:55:13.000000000 +1000
++++ ocaml-extlib-1.7.7/Makefile	2020-09-26 07:17:42.141178856 +1000
+@@ -1,5 +1,5 @@
+ 
+-VERSION:=$(shell git --git-dir=.git describe --always --long)
++VERSION:=1.7.7-0-gbd9f453
+ RELEASE:=1.7.7
+ 
+ ifndef VERSION
diff --git a/dev-ml/extlib/metadata.xml b/dev-ml/extlib/metadata.xml
index 1b2e3a5aafb0..f36445f85327 100644
--- a/dev-ml/extlib/metadata.xml
+++ b/dev-ml/extlib/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ocaml-extlib</remote-id>
 		<remote-id type="github">ygrek/ocaml-extlib</remote-id>
diff --git a/dev-ml/fieldslib/Manifest b/dev-ml/fieldslib/Manifest
index 13f75a822274..7cbfeb5dc885 100644
--- a/dev-ml/fieldslib/Manifest
+++ b/dev-ml/fieldslib/Manifest
@@ -1 +1,2 @@
+DIST fieldslib-0.14.0.tar.gz 3677 BLAKE2B 076fe0c83547a5276e6ab304409c1a636132738f8a95c4d9a4260e95f6a3c247341c3901e2cde4f63f1f4db417e3749d1e8cb128cf8c1711004e77f1d42472ef SHA512 245987817585222060c389a632fa229fa3c928090548a0b759e3b1eb06c868d06c0593b01bc41f453c209854a15115fa7650cc36888036f9e305cf2b79a5004c
 DIST fieldslib-0.9.0.tar.gz 5981 BLAKE2B 471e468bf731dfe2f8a237ba35df22dc3cfb5ee2e02c881dc0a82be577844a40607adbf807b9aadf3a120708687048e6219635b81216c92edc41c874118c8b63 SHA512 ac0ecbbb43f1d815462264ef5dd33b568aa8b479847789f0ac7eb5da5986849da6ca1c27db1c0643e64e83c625e98eb7abebb5e3045a95c4b7bf7384ea953720
diff --git a/dev-ml/fieldslib/fieldslib-0.14.0.ebuild b/dev-ml/fieldslib/fieldslib-0.14.0.ebuild
new file mode 100644
index 000000000000..39789c9b3eb2
--- /dev/null
+++ b/dev-ml/fieldslib/fieldslib-0.14.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Folding over record fields"
+HOMEPAGE="https://github.com/janestreet/fieldslib"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/base:=
+	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/ppxlib:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/fieldslib/metadata.xml b/dev-ml/fieldslib/metadata.xml
index 8406957e2af5..03041d90ca0d 100644
--- a/dev-ml/fieldslib/metadata.xml
+++ b/dev-ml/fieldslib/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<longdescription lang="en">
 		This library defines a syntax extension for OCaml using Camlp4 that
 		can be used to define first class values representing record fields,
diff --git a/dev-ml/findlib/files/externalmeta7.patch b/dev-ml/findlib/files/externalmeta7.patch
new file mode 100644
index 000000000000..8aa9fa566e59
--- /dev/null
+++ b/dev-ml/findlib/files/externalmeta7.patch
@@ -0,0 +1,13 @@
+Index: findlib-1.8.0/configure
+===================================================================
+--- findlib-1.8.0.orig/configure
++++ findlib-1.8.0/configure
+@@ -581,7 +581,7 @@ fi
+ 
+ # Generate the META files now.
+ 
+-l="$ldbm dynlink $lgraphics $lnum str threads unix stdlib bigarray ocamldoc $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes $lspacetime"
++l="dynlink str threads unix stdlib bigarray ocamldoc $lcomplibs $lbytes $lspacetime"
+ 
+ for dir in site-lib-src/*; do
+     # We do not really know if $dir is a directory.
diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..1799cc090907
--- /dev/null
+++ b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="OCaml tool to find/use non-standard packages"
+HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
+SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
+IUSE="doc +ocamlopt tk"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND=">=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?]
+	tk? ( dev-ml/labltk:= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/externalmeta7.patch )
+
+src_prepare() {
+	default
+	export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+	export stublibs="${ocamlfind_destdir}/stublibs"
+}
+
+src_configure() {
+	local myconf
+	use tk && myconf="-with-toolbox"
+	./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
+		-sitelib ${ocamlfind_destdir} \
+		-config ${ocamlfind_destdir}/findlib/findlib.conf \
+		-no-custom \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt # optimized code
+	fi
+}
+
+src_install() {
+	emake prefix="${D}" install
+
+	dodir "${stublibs#${EPREFIX}}"
+
+	if use doc; then
+		cd "${S}/doc" || die
+		dodoc QUICKSTART README DOCINFO
+		docinto html
+		dodoc -r ref-html guide-html
+	fi
+}
+
+check_stublibs() {
+	local ocaml_stdlib=`ocamlc -where`
+	local ldconf="${ocaml_stdlib}/ld.conf"
+
+	if [ ! -e ${ldconf} ]
+	then
+		echo "${ocaml_stdlib}" > ${ldconf}
+		echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+	fi
+
+	if [ -z `grep -e ${stublibs} ${ldconf}` ]
+	then
+		echo ${stublibs} >> ${ldconf}
+	fi
+}
+
+pkg_postinst() {
+	check_stublibs
+}
diff --git a/dev-ml/findlib/metadata.xml b/dev-ml/findlib/metadata.xml
index 7a38bb900964..a4f6be63adba 100644
--- a/dev-ml/findlib/metadata.xml
+++ b/dev-ml/findlib/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>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/integers/Manifest b/dev-ml/integers/Manifest
index 65fc1855d930..d75277c35802 100644
--- a/dev-ml/integers/Manifest
+++ b/dev-ml/integers/Manifest
@@ -1 +1,2 @@
 DIST integers-0.2.2.tbz 9155 BLAKE2B 7dcbf0a10cdd2f65683c590dcc18ab7a67540eb39b78500506b303afaf881d6322ac8014dff9a772d7b43cb9b4765dbf85cdb2d31a3a5a78cf5a8e674f18dfea SHA512 957ec87f385916a847eeccef1142d706cf2bf9024a4f0b97120f73a2eda4c049261078bc27227db14bfed53bf014da14a93ef75b515a851af72088bd8b04081a
+DIST integers-0.4.0.tar.gz 9980 BLAKE2B ee67c39024d77f4ce20e9ba7e1564b3418397f1e98b9a5f30e238f5c161d7572701e3d824871b46d15b90887d5f3983a9ab440f46e22c4de8cbc68912daea5eb SHA512 73af64654579b27db18c612229044dba094064dc7d36a73f42ffd4ba7040ed326f859f588e7a764bce3b2fd6e9365f9e9f99330ef29bafbe77ca6dcb53d5ed79
diff --git a/dev-ml/integers/integers-0.4.0.ebuild b/dev-ml/integers/integers-0.4.0.ebuild
new file mode 100644
index 000000000000..f5d613d94d85
--- /dev/null
+++ b/dev-ml/integers/integers-0.4.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Various signed and unsigned integer types for OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-integers"
+SRC_URI="https://github.com/ocamllabs/ocaml-integers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/ocaml-${P}"
diff --git a/dev-ml/integers/metadata.xml b/dev-ml/integers/metadata.xml
index db1b1361de5b..7c1e38b98cec 100644
--- a/dev-ml/integers/metadata.xml
+++ b/dev-ml/integers/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ocamllabs/ocaml-integers</remote-id>
 	</upstream>
diff --git a/dev-ml/jane-street-headers/Manifest b/dev-ml/jane-street-headers/Manifest
index dd32a3bfc906..7575bc0466f1 100644
--- a/dev-ml/jane-street-headers/Manifest
+++ b/dev-ml/jane-street-headers/Manifest
@@ -1 +1,2 @@
+DIST jane-street-headers-0.14.0.tar.gz 4662 BLAKE2B 22a48e9c254005d28c03399dd9d9347b45b7e3def9c0efdd768162f80ff611be6249d629cd78fd8768c7e6ec5610684e9459b149f3de85da307b2f1e8525296d SHA512 9c80acc57016f98cd88455866523f2463a13d2b7e10cf0d63f5198747615321799a8b3442432b321fa4f33a051f404464e27972317d197ac9513651600673879
 DIST jane-street-headers-0.9.0.tar.gz 6713 BLAKE2B fa8461922ad5e9c28fecb29bfb630d6b1578c8440ad82ab841da17c32ebdfef8ecac90ca66721aef06321a085e2b927904ced4c5a1c8ee6b3cc969dfcbf761bd SHA512 dbd1198b7eb45f06f7df6e9c5b66589b6004e9424f2ecdd50d20c3dc2f35048c42f9220f1d03b4b6564e7a79d00dbe3b3c9c767600e78d066266093b8d93ad46
diff --git a/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild b/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild
new file mode 100644
index 000000000000..bc24c70774d8
--- /dev/null
+++ b/dev-ml/jane-street-headers/jane-street-headers-0.14.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Jane Street header files"
+HOMEPAGE="https://github.com/janestreet/jane-street-headers"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/jane-street-headers/metadata.xml b/dev-ml/jane-street-headers/metadata.xml
index f2e7a5ae0bc8..c938bbaf6059 100644
--- a/dev-ml/jane-street-headers/metadata.xml
+++ b/dev-ml/jane-street-headers/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/jane-street-headers</remote-id>
 	</upstream>
diff --git a/dev-ml/jst-config/Manifest b/dev-ml/jst-config/Manifest
new file mode 100644
index 000000000000..cfc8c7df8140
--- /dev/null
+++ b/dev-ml/jst-config/Manifest
@@ -0,0 +1 @@
+DIST jst-config-0.14.0.tar.gz 4916 BLAKE2B e052cf9aad6e7bef737cd39643663b4577cffe9b9a8e116a8f23ce8d92ebb172d8c66eb20976c319593c217d95de253b4b7f86c05616bf665061896989f0908c SHA512 9d76f3394490762aaef36a3fd3ced4769da05e5a62176bb215379f18a29eab5089e65f599a3a3621937a5a79fcbda22cecf189e8e290acffef5b565e1b4d3b58
diff --git a/dev-ml/jst-config/jst-config-0.14.0.ebuild b/dev-ml/jst-config/jst-config-0.14.0.ebuild
new file mode 100644
index 000000000000..767128ba3e32
--- /dev/null
+++ b/dev-ml/jst-config/jst-config-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Compile-time configuration for Jane Street libraries"
+HOMEPAGE="https://github.com/janestreet/jst-config"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_assert:=
+	dev-ml/stdio:=
+	dev-ml/dune-configurator:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/jst-config/metadata.xml b/dev-ml/jst-config/metadata.xml
new file mode 100644
index 000000000000..dfb62d54d092
--- /dev/null
+++ b/dev-ml/jst-config/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/jst-config</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/lablgtk-sourceview/Manifest b/dev-ml/lablgtk-sourceview/Manifest
new file mode 100644
index 000000000000..f6a40d0e2049
--- /dev/null
+++ b/dev-ml/lablgtk-sourceview/Manifest
@@ -0,0 +1 @@
+DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
diff --git a/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.1.ebuild b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.1.ebuild
new file mode 100644
index 000000000000..4370e47018fa
--- /dev/null
+++ b/dev-ml/lablgtk-sourceview/lablgtk-sourceview-3.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=lablgtk3
+MY_P="${MY_PN}-${PV}"
+DUNE_PKG_NAME=${MY_PN}-sourceview3
+inherit dune
+
+DESCRIPTION="OCaml bindings to GTK-3"
+HOMEPAGE="https://github.com/garrigue/lablgtk"
+SRC_URI="https://github.com/garrigue/lablgtk/releases/download/${PV}/${MY_P}.tbz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="3/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	x11-libs/gtksourceview:3.0=
+	>=dev-ml/lablgtk-${PV}:3=
+		dev-ml/cairo2:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/lablgtk-sourceview/metadata.xml b/dev-ml/lablgtk-sourceview/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/lablgtk-sourceview/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/opam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 614b3963cf3b..7f5f09e07a7c 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,3 +1,4 @@
 DIST lablgtk-2.18.10.tar.gz 1068504 BLAKE2B 8f82cd8b31c136420bfbbeaf78ec2d7913b7c5fc16abd485c508f8de3ab587173b0b5c798cdbe851254b48754929c1f0063cfc9e3c5e0663b7cdebc380ec0e8a SHA512 73705aaa80db433d11a28df5f6f5d10bd282e477e90916152a87e71865ccfcd7dfbdbe77350ecadf61ba2ccc7a188de1c68f1e6385e20c75f167969001e8418d
 DIST lablgtk-2.18.5.tar.gz 808005 BLAKE2B 279fd9f018948438b616a12ab60fca3019330504a79d8b76c58fa0a99a7b36df9bf78f57f0e60c4eea6f0bad60f94c06b26490518ec25a5a72c342e4b7c42501 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
 DIST lablgtk-2.18.8.tar.gz 855263 BLAKE2B 92aeadcfac666756e50ea573c7a2119cc13eab5c2f2e033fcdf92d5c33d597d64bf2e860ff181d958b4d8e9a3d4002b3eaabbd1da7580444fee91dafaba26289 SHA512 1510b8886dd55b82fbc96f333d84779f51a4794d13b0934569d13b1975ded9ec684855b9856f636fb302fd8ff2f118d0d5f3ffb2b8086d22cdad442e963868ae
+DIST lablgtk3-3.1.1.tbz 854720 BLAKE2B e6a916151fe1ca0746c14c2a66cd178f3b0c051976815a1d13daf801002f16bc76d9f4cb15625353f0cfbdc16b0a218857d72c4e57125050bbcffe67f7096ad0 SHA512 193c340d9941680869eb90bc89f5b27cc5bdf294f4635081a9ba56a99fa2982266c4ee2eb5fd04d3a3f6150082800de5df786def8c72a276a779d843d914e9e3
diff --git a/dev-ml/lablgtk/lablgtk-3.1.1.ebuild b/dev-ml/lablgtk/lablgtk-3.1.1.ebuild
new file mode 100644
index 000000000000..095f7c620be0
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-3.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME=lablgtk3
+inherit dune
+
+DESCRIPTION="OCaml bindings to GTK-3"
+HOMEPAGE="https://github.com/garrigue/lablgtk"
+SRC_URI="https://github.com/garrigue/lablgtk/releases/download/${PV}/${DUNE_PKG_NAME}-${PV}.tbz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="3/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt sourceview"
+
+DEPEND="
+	app-text/gtkspell:3=
+	x11-libs/gtk+:3=
+	dev-ml/cairo2:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+PDEPEND="sourceview? ( dev-ml/lablgtk-sourceview:${SLOT} )"
+
+S="${WORKDIR}/${DUNE_PKG_NAME}-${PV}"
diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml
index 1fec605bab95..c0c9cf6b2c2b 100644
--- a/dev-ml/lablgtk/metadata.xml
+++ b/dev-ml/lablgtk/metadata.xml
@@ -5,6 +5,10 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 <use>
 	<flag name="glade">Enable libglade bindings compilation.</flag>
 	<flag name="gnomecanvas">Enable libgnomecanvas bindings compilation.</flag>
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index b139eb1dc0aa..52c917dfdd05 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -1,2 +1,3 @@
 DIST lwt-3.0.0.tar.gz 285864 BLAKE2B d14f8f8a9e71a61c57bd7c208575849667dab4a4770b56a0d94e93024b22be9b7d88d10c0fa24eb8060b67c75e72c2c8bbfa0362f3aa815c76c93575225ce056 SHA512 270a6dc2fc58950380eecf72767782c72a5d72226f4af0e9a4f9b0e70b788eeb1d2727348ab8da4411ee59374a19524a6a793b14a26fe7051d51f987ef0e42b8
 DIST lwt-3.1.0.tar.gz 285309 BLAKE2B ffc3a416491d4c7b7e7c0da67b48d9eeb5b7fa50e3637d4f0cfcd1689b75626b48c8dd6d91e87c93022047809a3774683c41ce620e07ee4d3e1409185e7f8d16 SHA512 0b2269e53f2e8a57e1ffd6f237c6b22de39a3b6b0d57276c7cb9371392aabc9fb6364b2617a6408ed0049ed64f71de0c540209cf83ce43899fd025295342eb0d
+DIST lwt-5.3.0.tar.gz 298152 BLAKE2B a39494bf98fcca07bf4601a742f4bfdc1ea2a67e2babbab650c41d2df58296a859520509ddc080af9c4d55be76439b401174720765fb942586d7c866f80cc538 SHA512 9922c19944595b0c07da8e1bbdecb2cc7c5a7edcdc2224215efb819d9c735da8986388a2446bd0762e28533f5d9d386970f07a4f1b0d14255c6743f3a1d16cb6
diff --git a/dev-ml/lwt/files/lwt-5.3.0-ppxlib-0.18.0.patch b/dev-ml/lwt/files/lwt-5.3.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..0bda140294a0
--- /dev/null
+++ b/dev-ml/lwt/files/lwt-5.3.0-ppxlib-0.18.0.patch
@@ -0,0 +1,401 @@
+--- lwt-5.3.0-orig/lwt_ppx.opam	2020-04-23 16:32:55.000000000 +1000
++++ lwt-5.3.0/lwt_ppx.opam	2020-10-12 22:12:12.863159266 +1100
+@@ -20,8 +20,7 @@
+   "dune" {>= "1.8.0"}
+   "lwt"
+   "ocaml" {>= "4.02.0"}
+-  "ocaml-migrate-parsetree" {>= "1.5.0"}
+-  "ppx_tools_versioned" {>= "5.3.0"}
++  "ppxlib" {>= "0.16.0"}
+ ]
+ 
+ build: [
+--- lwt-5.3.0-orig/src/ppx/dune	2020-04-23 16:32:55.000000000 +1000
++++ lwt-5.3.0/src/ppx/dune	2020-10-12 22:11:33.844038953 +1100
+@@ -13,10 +13,10 @@
+  (public_name lwt_ppx)
+  (synopsis "Lwt PPX syntax extension")
+  (modules ppx_lwt)
+- (libraries compiler-libs.common ocaml-migrate-parsetree ppx_tools_versioned)
++ (libraries compiler-libs.common ppxlib)
+  (ppx_runtime_libraries lwt)
+  (kind ppx_rewriter)
+- (preprocess (pps ppx_tools_versioned.metaquot_410 |} ^ bisect_ppx ^ {|))
++ (preprocess (pps ppxlib.metaquot|} ^ bisect_ppx ^ {|))
+  (flags (:standard -w +A-4)))
+ 
+ |}
+--- lwt-5.3.0-orig/src/ppx/ppx_lwt.ml	2020-04-23 16:32:55.000000000 +1000
++++ lwt-5.3.0/src/ppx/ppx_lwt.ml	2020-10-12 22:10:11.298784433 +1100
+@@ -1,16 +1,11 @@
+-open! Migrate_parsetree
+-open! OCaml_410.Ast
+-open Ast_mapper
++open! Ppxlib
++open Ast_builder.Default
+ open! Ast_helper
+-open Asttypes
+-open Parsetree
+-
+-open Ast_convenience_410
+ 
+ (** {2 Convenient stuff} *)
+ 
+-let with_loc f {txt ; loc = _loc} =
+-  (f txt) [@metaloc _loc]
++let with_loc f {txt ; loc } =
++  f ~loc txt
+ 
+ (** Test if a case is a catchall. *)
+ let is_catchall case =
+@@ -27,7 +22,7 @@
+     List.exists is_catchall cases
+   in
+   if not has_wildcard
+-  then cases @ [Exp.case [%pat? exn] [%expr Lwt.fail exn]] [@metaloc Location.none]
++  then cases @ (let loc = Location.none in [Exp.case [%pat? exn] [%expr Lwt.fail exn]])
+   else cases
+ 
+ (** {3 Internal names} *)
+@@ -73,34 +68,33 @@
+         evar ~loc:binding.pvb_expr.pexp_loc (gen_name i)
+       in
+       let fun_ =
+-        [%expr (fun [%p binding.pvb_pat] -> [%e aux (i+1) t])] [@metaloc e_loc]
++        let loc = e_loc in
++        [%expr (fun [%p binding.pvb_pat] -> [%e aux (i+1) t])]
+       in
+       let new_exp =
+-          [%expr
+-            let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
+-            Lwt.backtrace_bind
+-              (fun exn -> try Reraise.reraise exn with exn -> exn)
+-              [%e name]
+-              [%e fun_]
+-          ] [@metaloc e_loc]
++        let loc = e_loc in
++        [%expr
++          let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
++          Lwt.backtrace_bind
++            (fun exn -> try Reraise.reraise exn with exn -> exn)
++            [%e name]
++            [%e fun_]
++        ]
+       in
+       { new_exp with pexp_attributes = binding.pvb_attributes }
+   in aux 0 l
+ 
+-(* Note: instances of [@metaloc !default_loc] below are workarounds for
+-    https://github.com/ocaml-ppx/ppx_tools_versioned/issues/21. *)
+-
+ let lwt_sequence mapper ~exp ~lhs ~rhs ~ext_loc =
+-  let pat= [%pat? ()][@metaloc ext_loc] in
+-  let lhs, rhs = mapper.expr mapper lhs, mapper.expr mapper rhs in
+-    [%expr
+-      let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
+-      Lwt.backtrace_bind
+-        (fun exn -> try Reraise.reraise exn with exn -> exn)
+-        [%e lhs]
+-        (fun [%p pat] -> [%e rhs])
+-    ]
+-  [@metaloc exp.pexp_loc]
++  let pat= let loc = ext_loc in [%pat? ()] in
++  let lhs, rhs = mapper#expression lhs, mapper#expression rhs in
++  let loc = exp.pexp_loc in
++  [%expr
++    let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
++    Lwt.backtrace_bind
++      (fun exn -> try Reraise.reraise exn with exn -> exn)
++      [%e lhs]
++      (fun [%p pat] -> [%e rhs])
++  ]
+ 
+ (** For expressions only *)
+ (* We only expand the first level after a %lwt.
+@@ -121,7 +115,7 @@
+         (gen_bindings vbl)
+         (gen_binds exp.pexp_loc vbl e)
+     in
+-    Some (mapper.expr mapper { new_exp with pexp_attributes })
++    Some (mapper#expression { new_exp with pexp_attributes })
+ 
+   (* [match%lwt $e$ with $c$] ≡ [Lwt.bind $e$ (function $c$)]
+      [match%lwt $e$ with exception $x$ | $c$] ≡
+@@ -134,11 +128,8 @@
+         | _ -> false)
+     in
+     if cases = [] then
+-        raise (Location.Error (
+-          Location.errorf
+-            ~loc:exp.pexp_loc
+-            "match%%lwt must contain at least one non-exception pattern."
+-        ));
++      Location.raise_errorf ~loc:exp.pexp_loc
++        "match%%lwt must contain at least one non-exception pattern." ;
+     let exns =
+       exns |> List.map (
+         function
+@@ -150,22 +141,24 @@
+     let new_exp =
+       match exns with
+       | [] ->
+-        [%expr Lwt.bind [%e e] [%e Exp.function_ cases]] [@metaloc !default_loc]
+-      | _  ->  [%expr Lwt.try_bind (fun () -> [%e e])
+-                                   [%e Exp.function_ cases]
+-                                   [%e Exp.function_ exns]]
+-          [@metaloc !default_loc]
++        let loc = !default_loc in
++        [%expr Lwt.bind [%e e] [%e Exp.function_ cases]]
++      | _  ->
++        let loc = !default_loc in
++        [%expr Lwt.try_bind (fun () -> [%e e])
++            [%e Exp.function_ cases]
++            [%e Exp.function_ exns]]
+     in
+-    Some (mapper.expr mapper { new_exp with pexp_attributes })
++    Some (mapper#expression { new_exp with pexp_attributes })
+ 
+   (* [assert%lwt $e$] ≡
+      [try Lwt.return (assert $e$) with exn -> Lwt.fail exn] *)
+   | Pexp_assert e ->
+     let new_exp =
++      let loc = !default_loc in
+       [%expr try Lwt.return (assert [%e e]) with exn -> Lwt.fail exn]
+-        [@metaloc !default_loc]
+     in
+-    Some (mapper.expr mapper { new_exp with pexp_attributes })
++    Some (mapper#expression { new_exp with pexp_attributes })
+ 
+   (* [while%lwt $cond$ do $body$ done] ≡
+      [let rec __ppx_lwt_loop () =
+@@ -175,15 +168,15 @@
+   *)
+   | Pexp_while (cond, body) ->
+     let new_exp =
++      let loc = !default_loc in
+       [%expr
+         let rec __ppx_lwt_loop () =
+           if [%e cond] then Lwt.bind [%e body] __ppx_lwt_loop
+           else Lwt.return_unit
+         in __ppx_lwt_loop ()
+       ]
+-        [@metaloc !default_loc]
+     in
+-    Some (mapper.expr mapper { new_exp with pexp_attributes })
++    Some (mapper#expression { new_exp with pexp_attributes })
+ 
+   (* [for%lwt $p$ = $start$ (to|downto) $end$ do $body$ done] ≡
+      [let __ppx_lwt_bound = $end$ in
+@@ -193,16 +186,19 @@
+      in __ppx_lwt_loop $start$]
+   *)
+   | Pexp_for ({ppat_desc = Ppat_var p_var; _} as p, start, bound, dir, body) ->
+-    let comp, op = match dir with
+-      | Upto ->   evar ">", evar "+"
+-      | Downto -> evar "<", evar "-"
++    let comp, op =
++      let loc = !default_loc in
++      match dir with
++      | Upto ->   evar ~loc ">", evar ~loc "+"
++      | Downto -> evar ~loc "<", evar ~loc "-"
+     in
+-    let p' = with_loc (fun s -> evar s) p_var in
++    let p' = with_loc evar p_var in
+ 
+-    let exp_bound = [%expr __ppx_lwt_bound] [@metaloc bound.pexp_loc] in
+-    let pat_bound = [%pat? __ppx_lwt_bound] [@metaloc bound.pexp_loc] in
++    let exp_bound = let loc = bound.pexp_loc in [%expr __ppx_lwt_bound] in
++    let pat_bound = let loc = bound.pexp_loc in [%pat? __ppx_lwt_bound] in
+ 
+     let new_exp =
++      let loc = !default_loc in
+       [%expr
+         let [%p pat_bound] : int = [%e bound] in
+         let rec __ppx_lwt_loop [%p p] =
+@@ -210,9 +206,8 @@
+           else Lwt.bind [%e body] (fun () -> __ppx_lwt_loop ([%e op] [%e p'] 1))
+         in __ppx_lwt_loop [%e start]
+       ]
+-        [@metaloc !default_loc]
+     in
+-    Some (mapper.expr mapper { new_exp with pexp_attributes })
++    Some (mapper#expression { new_exp with pexp_attributes })
+ 
+ 
+   (* [try%lwt $e$ with $c$] ≡
+@@ -221,6 +216,7 @@
+   | Pexp_try (expr, cases) ->
+     let cases = add_wildcard_case cases in
+     let new_exp =
++      let loc = !default_loc in
+         [%expr
+           let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
+           Lwt.backtrace_catch
+@@ -228,9 +224,8 @@
+             (fun () -> [%e expr])
+             [%e Exp.function_ cases]
+         ]
+-          [@metaloc !default_loc]
+     in
+-    Some (mapper.expr mapper { new_exp with pexp_attributes })
++    Some (mapper#expression { new_exp with pexp_attributes })
+ 
+   (* [if%lwt $c$ then $e1$ else $e2$] ≡
+      [match%lwt $c$ with true -> $e1$ | false -> $e2$]
+@@ -240,37 +235,37 @@
+   | Pexp_ifthenelse (cond, e1, e2) ->
+     let e2 =
+       match e2 with
+-      | None -> [%expr Lwt.return_unit] [@metaloc !default_loc]
++      | None -> let loc = !default_loc in [%expr Lwt.return_unit]
+       | Some e -> e
+     in
+     let cases =
++      let loc = !default_loc in
+       [
+-        Exp.case ([%pat? true] [@metaloc !default_loc]) e1 ;
+-        Exp.case ([%pat? false] [@metaloc !default_loc]) e2 ;
++        Exp.case [%pat? true] e1 ;
++        Exp.case [%pat? false] e2 ;
+       ]
+     in
+     let new_exp =
++      let loc = !default_loc in
+       [%expr Lwt.bind [%e cond] [%e Exp.function_ cases]]
+-        [@metaloc !default_loc]
+     in
+-    Some (mapper.expr mapper { new_exp with pexp_attributes })
++    Some (mapper#expression { new_exp with pexp_attributes })
+ 
+   | _ ->
+     None
+ 
+ let warned = ref false
+ 
+-let mapper =
+-  { default_mapper with
++class mapper = object (self)
++  inherit Ast_traverse.map as super
+ 
+-    structure = begin fun mapper structure ->
+-      if !warned then
+-        default_mapper.structure mapper structure
++  method! structure = begin fun structure ->
++      if !warned then super#structure structure
+ 
+       else begin
+         warned := true;
+-        let structure = default_mapper.structure mapper structure in
+-        let loc = Location.in_file !Location.input_name in
++        let structure = super#structure structure in
++        let loc = Location.in_file !Ocaml_common.Location.input_name in
+ 
+         let warn_if condition message structure =
+           if condition then
+@@ -287,9 +282,9 @@
+           ("-no-sequence is a deprecated Lwt PPX option\n" ^
+            "  See https://github.com/ocsigen/lwt/issues/495")
+       end
+-    end;
++    end
+ 
+-    expr = (fun mapper expr ->
++  method! expression = (fun expr ->
+       match expr with
+       | { pexp_desc=
+             Pexp_extension (
+@@ -297,7 +292,7 @@
+               PStr[{pstr_desc= Pstr_eval (exp, _);_}]);
+           _
+         }->
+-        begin match lwt_expression mapper exp expr.pexp_attributes ext_loc with
++        begin match lwt_expression self exp expr.pexp_attributes ext_loc with
+         | Some expr' -> expr'
+         | None -> expr
+         end
+@@ -306,47 +301,45 @@
+       | [%expr [%e? exp ] [%finally     [%e? finally]] ]
+       | [%expr [%e? exp ] [%lwt.finally [%e? finally]] ] ->
+         let new_exp =
+-            [%expr
+-              let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
+-              Lwt.backtrace_finalize
+-                (fun exn -> try Reraise.reraise exn with exn -> exn)
+-                (fun () -> [%e exp])
+-                (fun () -> [%e finally])
+-            ]
+-              [@metaloc !default_loc]
++          let loc = !default_loc in
++          [%expr
++            let module Reraise = struct external reraise : exn -> 'a = "%reraise" end in
++            Lwt.backtrace_finalize
++              (fun exn -> try Reraise.reraise exn with exn -> exn)
++              (fun () -> [%e exp])
++              (fun () -> [%e finally])
++          ]
+         in
+-        mapper.expr mapper
++        super#expression
+           { new_exp with
+             pexp_attributes = expr.pexp_attributes @ exp.pexp_attributes
+           }
+ 
+       | [%expr [%finally     [%e? _ ]]]
+       | [%expr [%lwt.finally [%e? _ ]]] ->
+-        raise (Location.Error (
+-          Location.errorf
+-            ~loc:expr.pexp_loc
+-            "Lwt's finally should be used only with the syntax: \"(<expr>)[%%finally ...]\"."
+-        ))
++        Location.raise_errorf ~loc:expr.pexp_loc
++          "Lwt's finally should be used only with the syntax: \"(<expr>)[%%finally ...]\"."
+ 
+       | _ ->
+-        default_mapper.expr mapper expr);
+-    structure_item = (fun mapper stri ->
++        super#expression expr)
++
++  method! structure_item = (fun stri ->
+       default_loc := stri.pstr_loc;
+       match stri with
+       | [%stri let%lwt [%p? var] = [%e? exp]] ->
+         let warning =
+-          str
++          estring ~loc:!default_loc
+             ("let%lwt should not be used at the module item level.\n" ^
+              "Replace let%lwt x = e by let x = Lwt_main.run (e)")
+         in
++        let loc = !default_loc in
+         [%stri
+           let [%p var] =
+             (Lwt_main.run [@ocaml.ppwarning [%e warning]])
+-              [%e mapper.expr mapper exp]]
+-          [@metaloc !default_loc]
++              [%e super#expression exp]]
+ 
+-      | x -> default_mapper.structure_item mapper x);
+-}
++      | x -> super#structure_item x);
++end
+ 
+ 
+ let args =
+@@ -361,5 +354,8 @@
+   ]
+ 
+ let () =
+-  Driver.register ~name:"ppx_lwt" ~args Versions.ocaml_410
+-    (fun _config _cookies -> mapper)
++  let mapper = new mapper in
++  Driver.register_transformation "ppx_lwt"
++    ~impl:mapper#structure
++    ~intf:mapper#signature ;
++  List.iter (fun (key, spec, doc) -> Driver.add_arg key spec ~doc) args
+--- lwt-5.3.0-orig/src/ppx/ppx_lwt.mli	2020-04-23 16:32:55.000000000 +1000
++++ lwt-5.3.0/src/ppx/ppx_lwt.mli	2020-10-12 22:10:45.384889535 +1100
+@@ -161,4 +161,4 @@
+ *)
+ 
+ 
+-val mapper : Migrate_parsetree.OCaml_410.Ast.Ast_mapper.mapper
++class mapper : Ppxlib.Ast_traverse.map
diff --git a/dev-ml/lwt/lwt-5.3.0.ebuild b/dev-ml/lwt/lwt-5.3.0.ebuild
new file mode 100644
index 000000000000..417b2d5dfd1b
--- /dev/null
+++ b/dev-ml/lwt/lwt-5.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Cooperative light-weight thread library for OCaml"
+SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://ocsigen.org/lwt"
+
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/seq:=
+	dev-ml/result:=
+	dev-ml/mmap:=
+	dev-ml/ocplib-endian:=
+	>=dev-ml/ppxlib-0.18.0:=
+	dev-ml/react:=
+	dev-ml/dune-configurator:=
+	dev-libs/libev"
+
+RDEPEND="${DEPEND}
+	!<www-servers/ocsigen-1.1"
+DEPEND="${DEPEND}
+	dev-ml/cppo
+	dev-ml/findlib"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1-with-linking-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# backported from https://github.com/ocsigen/lwt/pull/807
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.3.0-ppxlib-0.18.0.patch
+)
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
index 78de251d544a..876bdf620f96 100644
--- a/dev-ml/lwt/metadata.xml
+++ b/dev-ml/lwt/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<use>
 		<flag name="camlp4">Enable camlp4 syntax extension</flag>
 		<flag name="libev">Enable the <pkg>dev-libs/libev</pkg>-based backend.</flag>
diff --git a/dev-ml/mccs/Manifest b/dev-ml/mccs/Manifest
new file mode 100644
index 000000000000..191a387e9903
--- /dev/null
+++ b/dev-ml/mccs/Manifest
@@ -0,0 +1 @@
+DIST mccs-1.1.11.tar.gz 1008163 BLAKE2B 49f173b99baa1acfd96f8ef873b664ba61dc9a770ad62873f956f017e3940737be74f5d5392d4043c9ade3e74e09d9c6b11c47af7755558b25f1f62e6ab80d84 SHA512 095393ca63fb591a833a7a37117a80a2e817b437bbcd655301b376f749a3756c8aff26b2fcdebfc5f68b9c30d8971a7ba057f610117516e3e85a3fe7bd3906d0
diff --git a/dev-ml/mccs/mccs-1.1.11.ebuild b/dev-ml/mccs/mccs-1.1.11.ebuild
new file mode 100644
index 000000000000..d3f8dab35e06
--- /dev/null
+++ b/dev-ml/mccs/mccs-1.1.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV=$(ver_rs 2 '+')
+
+DESCRIPTION="Multi Criteria CUDF Solver"
+HOMEPAGE="http://www.i3s.unice.fr/~cpjm/misc/ https://github.com/AltGr/ocaml-mccs/issues"
+SRC_URI="https://github.com/AltGr/ocaml-mccs/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+
+RDEPEND="
+	dev-ml/cudf:=
+	sci-mathematics/glpk:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ml/extlib:=
+		)
+"
+
+S=${WORKDIR}/ocaml-${PN}-$(ver_rs 2 '-')
diff --git a/dev-ml/mccs/metadata.xml b/dev-ml/mccs/metadata.xml
new file mode 100644
index 000000000000..cb477b7c6e26
--- /dev/null
+++ b/dev-ml/mccs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">AltGr/ocaml-mccs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/mmap/Manifest b/dev-ml/mmap/Manifest
new file mode 100644
index 000000000000..698345342ed6
--- /dev/null
+++ b/dev-ml/mmap/Manifest
@@ -0,0 +1 @@
+DIST mmap-v1.0.2.tbz 14575 BLAKE2B ddc0ce540780bf362662b90ba0ba71098151bfaf2633161d747f6122b34b4cec813c0a839f5f702595fa9d81b24a4d550fcaa6600d6fdd7560947e71c87b1b6a SHA512 280afb62a0cc5b13f7e9485bb81c0fe6bff91a3838420495ce7a10709af987264590562f21b2d66e778b7e606be3f1f940ebb090e4fa0af5702f09bacab93cbe
diff --git a/dev-ml/mmap/metadata.xml b/dev-ml/mmap/metadata.xml
new file mode 100644
index 000000000000..3c0ce5319562
--- /dev/null
+++ b/dev-ml/mmap/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mirage/mmap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/mmap/mmap-1.0.2.ebuild b/dev-ml/mmap/mmap-1.0.2.ebuild
new file mode 100644
index 000000000000..3893cb7deb34
--- /dev/null
+++ b/dev-ml/mmap/mmap-1.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="File mapping"
+HOMEPAGE="https://github.com/mirage/mmap"
+SRC_URI="https://github.com/mirage/mmap/releases/download/v${PV}/${PN}-v${PV}.tbz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-v${PV}"
diff --git a/dev-ml/num/metadata.xml b/dev-ml/num/metadata.xml
index d0e866f244f8..000cf86e43c1 100644
--- a/dev-ml/num/metadata.xml
+++ b/dev-ml/num/metadata.xml
@@ -5,4 +5,8 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/num/num-1.3-r1.ebuild b/dev-ml/num/num-1.3-r1.ebuild
new file mode 100644
index 000000000000..5b41e68c5852
--- /dev/null
+++ b/dev-ml/num/num-1.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib findlib
+
+DESCRIPTION="Library for arbitrary-precision integer and rational arithmetic"
+HOMEPAGE="https://github.com/ocaml/num"
+SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt]
+	>=dev-ml/findlib-1.8.1[ocamlopt]"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	findlib_src_preinst
+	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}"
+}
diff --git a/dev-ml/ocaml-compiler-libs/Manifest b/dev-ml/ocaml-compiler-libs/Manifest
index bc5a18b49d93..fc5192363d71 100644
--- a/dev-ml/ocaml-compiler-libs/Manifest
+++ b/dev-ml/ocaml-compiler-libs/Manifest
@@ -1 +1,2 @@
+DIST ocaml-compiler-libs-0.12.3.tar.gz 4982 BLAKE2B 83432cbb2707964f025b294a84cdcce77137156e409d85ce8615dd6e9a26ad085cd5de178ebeb7520cd95b19a15b3cfbf7ef9567d165b55e07850a231b68371c SHA512 748ae11fe4cedb12d153ef2e712a9899f6a7ab4a35ddb7c95c0ae25af979c3edf274046745dddb2253fc06be41d5b0029f11a5a823a17d1ee680ffb29c4bdc89
 DIST ocaml-compiler-libs-0.9.0.tar.gz 6937 BLAKE2B d53a8312ffabfed0b137d435497b4d7953239f57176481f522cbb70fd49a1a8045850d7572830455aefff1a91c6c461c03f40392b386bacb03afda3f72e39005 SHA512 ee0751bcfb9cb75d272f7af4f7da184c0a8e348384a2481da9dea0245a4133de908a23d0a324e0353397a4f0c5bfd71d40a6a46dbd8e4acea922bad7cdc5ef64
diff --git a/dev-ml/ocaml-compiler-libs/metadata.xml b/dev-ml/ocaml-compiler-libs/metadata.xml
index b15fbc969a48..386b3cb8e9bc 100644
--- a/dev-ml/ocaml-compiler-libs/metadata.xml
+++ b/dev-ml/ocaml-compiler-libs/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ocaml-compiler-libs</remote-id>
 	</upstream>
diff --git a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
new file mode 100644
index 000000000000..dbbcd84de28f
--- /dev/null
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.12.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Repackage the OCaml compiler libs so they do not expose everything at toplevel"
+HOMEPAGE="https://github.com/janestreet/ocaml-compiler-libs"
+SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/ocaml-ctypes/Manifest b/dev-ml/ocaml-ctypes/Manifest
index dca907ace49c..7538af6c255f 100644
--- a/dev-ml/ocaml-ctypes/Manifest
+++ b/dev-ml/ocaml-ctypes/Manifest
@@ -2,3 +2,4 @@ DIST ocaml-ctypes-0.11.2.tar.gz 203564 BLAKE2B 2a8c0ee8f8dcd78c3f93b506e92f2c347
 DIST ocaml-ctypes-0.11.3.tar.gz 204959 BLAKE2B f3863e29d355479f9306c39786d56839ab05a119dfd5a64de1a784d71e8d931d5fad0f306402aadb50bc5e8147ab7668ac026b5bfbbaff2b6530d7a33f9f38cc SHA512 e7698954a6b683869a1482af8fe1bbeb5ccf693c2bb8583e2c19c5da92ed2730466e373c6f53d9ff9f09c2bdedf102da3f76b75511d7f9b7d266ac0765999f94
 DIST ocaml-ctypes-0.12.1.tar.gz 199686 BLAKE2B d131bb8ebe8448c6d252d32b6a6de2e555f4c7802bec0da83f33ac402d1fd1c73db9abb97fe9f7065fbeaddc782c0976bb05ef6ee6aa80e20b46074a48c343c3 SHA512 801c66395d843c9e410736a06ab5e03bbe22851a364dc9b9444f49dc133e0f5e0b7a1c31e88de56d23a21817cb35595a1b6743c430c8c1a689b7ae12adc8856f
 DIST ocaml-ctypes-0.13.0.tar.gz 200959 BLAKE2B 9f7274099924bd5502fc8115a1e5ed32f9b56902ce284f5530710c948d6d735a2abfd30affa5f1f7803edb33e062c288963946846be29977af87f19f47dd0fbe SHA512 ba2e4cd77d42cf032d823e26f94a8cc37d81ac12bafd40c5d61685d66c97e18996a286dd8d486c94ad4a34e4214e55104e6283158962871e7f0722b2144f7a7d
+DIST ocaml-ctypes-0.17.1.tar.gz 208101 BLAKE2B b9fe6632058a670c988ba9f1ae81b75aa5373de7231cef04d5e2ede61a44cbaa0324c04197a0a202847599a9bbe7dccd18fd3279f3f351493aaec4959caf3ada SHA512 1e197009f7e6b29b43944f757e987934337ebfa11bb2ff2ca8ba3ebc607e37cf1259d07a90d7faf4b91b49ee20d5c65357ad305f34ada0a8d336a3904233150e
diff --git a/dev-ml/ocaml-ctypes/metadata.xml b/dev-ml/ocaml-ctypes/metadata.xml
index 036e86e13c25..e3a65adc3e77 100644
--- a/dev-ml/ocaml-ctypes/metadata.xml
+++ b/dev-ml/ocaml-ctypes/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">ocamllabs/ocaml-ctypes</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocamllabs/ocaml-ctypes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild
new file mode 100644
index 000000000000..5370c08eb051
--- /dev/null
+++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.17.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="Library for binding to C libraries using pure OCaml"
+HOMEPAGE="https://github.com/ocamllabs/ocaml-ctypes"
+SRC_URI="https://github.com/ocamllabs/ocaml-ctypes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02:=[ocamlopt]
+	>=dev-libs/libffi-3.3_rc0:0/7
+	dev-ml/integers:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit2 dev-ml/lwt )"
+
+src_prepare() {
+	sed -e 's/oUnit/ounit2/g' -i Makefile.tests || die
+	default
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	findlib_src_install
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/ocaml-expat/files/ounit2.patch b/dev-ml/ocaml-expat/files/ounit2.patch
new file mode 100644
index 000000000000..5cbcc4e12b98
--- /dev/null
+++ b/dev-ml/ocaml-expat/files/ounit2.patch
@@ -0,0 +1,17 @@
+Index: ocaml-expat-1.1.0/Makefile
+===================================================================
+--- ocaml-expat-1.1.0.orig/Makefile
++++ ocaml-expat-1.1.0/Makefile
+@@ -85,10 +85,10 @@ test: unittest
+ testopt: unittest.opt
+ 	./unittest.opt
+ unittest: all unittest.ml
+-	$(OCAMLFIND) ocamlc -o unittest -package oUnit -ccopt -L. -linkpkg \
++	$(OCAMLFIND) ocamlc -o unittest -package ounit2 -ccopt -L. -linkpkg \
+ 	$(ARCHIVE) unittest.ml
+ unittest.opt: allopt unittest.ml
+-	$(OCAMLFIND) ocamlopt -o unittest.opt -package oUnit -ccopt -L. -linkpkg \
++	$(OCAMLFIND) ocamlopt -o unittest.opt -package ounit2 -ccopt -L. -linkpkg \
+ 	$(XARCHIVE) unittest.ml
+ 
+ ## Cleaning up
diff --git a/dev-ml/ocaml-expat/metadata.xml b/dev-ml/ocaml-expat/metadata.xml
index b6a93442203a..f91d68f6062b 100644
--- a/dev-ml/ocaml-expat/metadata.xml
+++ b/dev-ml/ocaml-expat/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">whitequark/ocaml-expat</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">whitequark/ocaml-expat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..152a3ca7fbf3
--- /dev/null
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+IUSE="doc +ocamlopt test"
+
+DESCRIPTION="OCaml bindings for expat"
+SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/whitequark/ocaml-expat"
+
+RDEPEND="dev-libs/expat
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit2 )"
+
+SLOT="0/${PV}"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+PATCHES=( "${FILESDIR}/ounit2.patch" )
+
+src_compile() {
+	emake depend
+	emake all
+	if use ocamlopt; then
+		emake allopt
+	fi
+	if use doc; then
+		emake doc
+	fi
+}
+
+src_test() {
+	emake test
+	if use ocamlopt; then
+		emake testopt
+	fi
+}
+src_install() {
+	findlib_src_preinst
+	emake install
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/*
+	fi
+	dodoc README
+}
diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest
index 8469270d5ce0..1c58aad13898 100644
--- a/dev-ml/ocaml-migrate-parsetree/Manifest
+++ b/dev-ml/ocaml-migrate-parsetree/Manifest
@@ -1,3 +1,4 @@
 DIST ocaml-migrate-parsetree-1.0.5.tar.gz 209078 BLAKE2B f56bd7c142280c3da6439f2e8d72ca43a9c2f5068775fb7ae5e4b73b8f8824ead04d9646b3dfcacc1db6acef2245038b7e4dcfc927c4e7d79e1e90229b143bf5 SHA512 eff87416eeb6175820bedfa3160160fa7328bcee3d05e066b5a94db25a476299f3f5ad07db22eb192f84e5b83804cf2e3a66d77561c984d658d9255c43660b90
 DIST ocaml-migrate-parsetree-1.0.6.tar.gz 209199 BLAKE2B 5682cf02ea17e53f352a9ed8d198bb5a8a8aceedac6754f3d60644a7f21e1fc9cd4daecc24cc8d65f790846cd8518daf874710a6e4ee9ef8c27aec0f7fd43162 SHA512 b44b9fc59cef787a0188245be357685fe7ecd5cc81368b5677b3389e8d09834e5e40f94a3cd7be762f3eb27657a628c0a228c4cefe4443ad1dc8ce012f2552b4
 DIST ocaml-migrate-parsetree-1.0.7.tar.gz 209251 BLAKE2B ad221fd6a3a91d546d3bc75495f32914b99eb0dcdcf3fbe6f76cb80f85a46346815a21bffa872f2aefe09109ab162d19f7019a8d0441d4f9f7ce22c0ada13f2e SHA512 3ba1bfe4840b2664b5053068b3659eb6a2ca216f29ece3f4522d1e7c5d87cb643bfb59ebe0563264cafdc31b9aa572007b4261fd3df8b27607fad47ff6168892
+DIST ocaml-migrate-parsetree-2.0.0.tar.gz 150973 BLAKE2B f9cdaabfccd82ba2fcd02a044815072ac6495c46ece5cce306a108246dbe68b711f163b05702dc657cc8ee56f1080a5e83430ce2084990fa4ab2a4740fef77c2 SHA512 eba6574339225c44a1872e91fb95b3e8953031b2550038497c57832c94b02297ca3215525341bbe114fe480198519965a6a1619e6490a57ad66f65eff66d160d
diff --git a/dev-ml/ocaml-migrate-parsetree/metadata.xml b/dev-ml/ocaml-migrate-parsetree/metadata.xml
index fef8db57a990..418d2940e0c7 100644
--- a/dev-ml/ocaml-migrate-parsetree/metadata.xml
+++ b/dev-ml/ocaml-migrate-parsetree/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-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>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">let-def/ocaml-migrate-parsetree</remote-id>
+		<remote-id type="github">ocaml-ppx/ocaml-migrate-parsetree</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.0.0.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.0.0.ebuild
new file mode 100644
index 000000000000..2ccef7340e63
--- /dev/null
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-2.0.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Convert OCaml parsetrees between different major versions"
+HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree"
+SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+
+DEPEND="
+	dev-ml/ppx_derivers
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocamlweb/Manifest b/dev-ml/ocamlweb/Manifest
index ca1439647035..90aa548d5535 100644
--- a/dev-ml/ocamlweb/Manifest
+++ b/dev-ml/ocamlweb/Manifest
@@ -1 +1,2 @@
 DIST ocamlweb-1.39.tar.gz 141866 BLAKE2B 14ab9c595133d34d9711da2232fdf6a89a7b134ec2537e70d6ee6ecbfdb19a8bfb6a1a7aed6207cbb1bbe1f5e7b651d33fed35d8f26129d69e29dc5995d5c342 SHA512 f4e2d330222378b632ace70efb7062c93002a85db6dc9a821706a76a1e1c00da4d4e82e618f162584003b821bc72d2d11508ae22474db61cc4367ed528d21d50
+DIST ocamlweb-1.41.tar.gz 141844 BLAKE2B b89b20bdc8b99d34069b2e32a6bd8c9684e294fba667a4b74080b34f37c6d90432c61e71e27f4f1772cda8a26891655bd99a21defa584f4a1c68ae1e0d58d454 SHA512 7a6403f8b0de3feeef9657e8aff10e6f1fe29edc400ce3f11c6435d6350314423fb74e192e4275a9ad47170019d6a960daf74f245539f0f3f2a6072cc7195442
diff --git a/dev-ml/ocamlweb/files/ocamlweb-1.41-ocaml-4.08.0.patch b/dev-ml/ocamlweb/files/ocamlweb-1.41-ocaml-4.08.0.patch
new file mode 100644
index 000000000000..b8da9e02b032
--- /dev/null
+++ b/dev-ml/ocamlweb/files/ocamlweb-1.41-ocaml-4.08.0.patch
@@ -0,0 +1,53 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Fri, 6 Sep 2019 09:53:22 +0200
+Subject: Fix compilation with OCaml 4.08.0
+
+---
+ web.ml | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/web.ml b/web.ml
+index 7dc1470..6f9ca51 100644
+--- a/web.ml
++++ b/web.ml
+@@ -247,14 +247,16 @@ let norm_string s =
+ 
+ let alpha_string s1 s2 =
+   match what_is_first_char s1, what_is_first_char s2 with
+-    | Symbol, Symbol -> s1 < s2
+-    | Symbol, _ -> true
+-    | _, Symbol -> false
+-    | _,_ -> norm_string s1 < norm_string s2
++    | Symbol, Symbol -> compare s1 s2
++    | Symbol, _ -> -1
++    | _, Symbol -> 1
++    | _,_ -> compare (norm_string s1) (norm_string s2)
++
++let ( ++ ) c1 c2 =
++  if c1 = 0 then c2 else c1
+ 
+ let order_entry e1 e2 =
+-  (alpha_string e1.e_name e2.e_name) ||
+-  (e1.e_name = e2.e_name && e1.e_type < e2.e_type)
++  alpha_string e1.e_name e2.e_name ++ compare e1.e_type e2.e_type
+ 
+ (*s The following function collects all the index entries and sort them
+     using [alpha_string], returning a list. *)
+@@ -264,7 +266,7 @@ module Idset = Set.Make(struct type t = index_entry let compare = compare end)
+ let all_entries () =
+   let s = Idmap.fold (fun x _ s -> Idset.add x s) !used Idset.empty in
+   let s = Idmap.fold (fun x _ s -> Idset.add x s) !defined s in
+-  Sort.list order_entry (Idset.elements s)
++  List.sort order_entry (Idset.elements s)
+ 
+ 
+ (*s When we are in \LaTeX\ style, an index entry only consists in two lists
+@@ -324,7 +326,7 @@ let list_in_table id t =
+   try
+     let l = Whereset.elements (Idmap.find id t) in
+     let l = map_succeed_nf find_where l in
+-    let l = Sort.list (fun x x' -> snd x < snd x') l in
++    let l = List.sort (fun x x' -> compare (snd x) (snd x')) l in
+     uniquize l
+   with Not_found ->
+     []
diff --git a/dev-ml/ocamlweb/files/ocamlweb-1.41-strip.patch b/dev-ml/ocamlweb/files/ocamlweb-1.41-strip.patch
new file mode 100644
index 000000000000..1cb407a4a51e
--- /dev/null
+++ b/dev-ml/ocamlweb/files/ocamlweb-1.41-strip.patch
@@ -0,0 +1,17 @@
+--- ocamlweb-1.41-orig/Makefile.in	2019-01-25 20:54:14.000000000 +1100
++++ ocamlweb-1.41/Makefile.in	2020-10-12 19:49:20.490860201 +1100
+@@ -61,14 +61,12 @@
+ 
+ ocamlweb: $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
+ 	$(CAMLCOPT) $(OPTFLAGS) -o $@ -I +compiler-libs ocamloptcomp.cmxa $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
+-	strip ocamlweb
+ 
+ ocamlweb.byte: $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
+ 	$(CAMLC) $(BYTEFLAGS) -o $@ $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
+ 
+ ocamlweb.static: $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
+ 	$(CAMLCOPT) $(OPTFLAGS) -cclib -static -o $@ $(CAML_CMX) $(CAMLLEX_CMX) $(CMX)
+-	strip $@
+ 
+ debug: $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
+ 	$(CAMLC) $(BYTEFLAGS) -o ocamlweb-debug $(CAML_CMO) $(CAMLLEX_CMO) $(CMO)
diff --git a/dev-ml/ocamlweb/metadata.xml b/dev-ml/ocamlweb/metadata.xml
index 6f49eba8f496..a4f6be63adba 100644
--- a/dev-ml/ocamlweb/metadata.xml
+++ b/dev-ml/ocamlweb/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>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/ocamlweb/ocamlweb-1.41.ebuild b/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
new file mode 100644
index 000000000000..1024343cc3c3
--- /dev/null
+++ b/dev-ml/ocamlweb/ocamlweb-1.41.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="O'Caml literate programming tool"
+HOMEPAGE="https://www.lri.fr/~filliatr/ocamlweb/"
+SRC_URI="https://www.lri.fr/~filliatr/ftp/ocamlweb/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+DEPEND=">=dev-lang/ocaml-4.08.0:=
+	virtual/latex-base
+	dev-texlive/texlive-latexextra
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.41-strip.patch"
+	"${FILESDIR}/${PN}-1.41-ocaml-4.08.0.patch"
+	)
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	emake UPDATETEX="" prefix="${D}/usr" MANDIR="${D}/usr/share/man" BASETEXDIR="${D}/${TEXMF}" install
+	dodoc README CHANGES
+}
diff --git a/dev-ml/ocplib-endian/Manifest b/dev-ml/ocplib-endian/Manifest
index 8add618f0052..92e1b8109075 100644
--- a/dev-ml/ocplib-endian/Manifest
+++ b/dev-ml/ocplib-endian/Manifest
@@ -1 +1,2 @@
 DIST ocplib-endian-1.0.tar.gz 62753 BLAKE2B d343343eb22b7ff591219ad0d45502e3450cd4200d8f3cc7f8a4783bdd93752d015b686b57aa574f58344dc44cec751ba89e68f93770ca5df73a98d95a604b8d SHA512 a08fd58ec5e72510c40e8b75e0ee8327ee658f479e45dd4632bc04e3907d04aaa3684df3b993ab63fc2a6c1f1a4fb32784e9b5258730d3b89a716300522d8d7f
+DIST ocplib-endian-1.1.tar.gz 17544 BLAKE2B 62e4b1cb998ac00fd3cfd7178939b6c9f8c1bebe7c0dc072fbb45b79172cb07f4466e5f1e6e93b41e3fb8c3df8020d2033eb24abfec4906d3ad003fa22bdcd27 SHA512 39351c666d1394770696fa89ac62f7c137ad1697d99888bfba2cc8de2c61df05dd8b3aa327c117bf38f3e29e081026d2c575c5ad0022bde92b3d43aba577d3f9
diff --git a/dev-ml/ocplib-endian/metadata.xml b/dev-ml/ocplib-endian/metadata.xml
index 97705efc3173..79e925f71327 100644
--- a/dev-ml/ocplib-endian/metadata.xml
+++ b/dev-ml/ocplib-endian/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <!-- maintainer-needed -->
-   <upstream>
-        <remote-id type="github">OCamlPro/ocplib-endian</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">OCamlPro/ocplib-endian</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocplib-endian/ocplib-endian-1.1.ebuild b/dev-ml/ocplib-endian/ocplib-endian-1.1.ebuild
new file mode 100644
index 000000000000..92a15b5de084
--- /dev/null
+++ b/dev-ml/ocplib-endian/ocplib-endian-1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Functions to read and write int16/32/64 from strings, bytes, and bigarrays"
+HOMEPAGE="https://github.com/OCamlPro/ocplib-endian"
+SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+# 2 of 70 tests fail
+RESTRICT=test
+
+DEPEND="
+	>=dev-ml/cppo-1.1.0
+"
+RDEPEND=""
diff --git a/dev-ml/octavius/Manifest b/dev-ml/octavius/Manifest
index 43e1d879e4fa..d3c65a9c2059 100644
--- a/dev-ml/octavius/Manifest
+++ b/dev-ml/octavius/Manifest
@@ -1 +1,2 @@
 DIST octavius-1.1.0.tar.gz 13767 BLAKE2B ad6f7a252ff853eb26348ce66cfa6ce9afdc4a4655d4f0c79e0f5e1ab354bfed62da396c312ca8b402ebf116a5be70afce7b26810723c2b27be37656bc63406f SHA512 db1f7da7af07d9ff1a4b1c51dbd2861e4dddab13958e7bccdd0c42494fa95f0b4277b222652ef73198f5aeb2ac44de4204459c7d1085810864958da251d5ec09
+DIST octavius-1.2.2.tar.gz 14910 BLAKE2B ad2c6cc274e205918276ed8ab58032ce3f5fb5d564c1ad7cc33c2d73accf1952e972899bd872b9bcb190fcfa223ee4de7f74fbeba44720b3fe78725d1d4d2561 SHA512 57e40f0bd03599bf0b14d85b29bef2214f9b9393917c0a65acf60cf028fe028a730a804f3c0101fee1378cacd4feb7a4f2df3c8411ceeb6bb34d47f849b7a55e
diff --git a/dev-ml/octavius/metadata.xml b/dev-ml/octavius/metadata.xml
index fbaf2f9f38c4..365c9666dff4 100644
--- a/dev-ml/octavius/metadata.xml
+++ b/dev-ml/octavius/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ocaml-doc/octavius</remote-id>
 	</upstream>
diff --git a/dev-ml/octavius/octavius-1.2.2.ebuild b/dev-ml/octavius/octavius-1.2.2.ebuild
new file mode 100644
index 000000000000..fb28159d4a13
--- /dev/null
+++ b/dev-ml/octavius/octavius-1.2.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="ocamldoc comment syntax parser"
+HOMEPAGE="https://github.com/ocaml-doc/octavius"
+SRC_URI="https://github.com/ocaml-doc/octavius/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${DEPEND}"
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
new file mode 100644
index 000000000000..db4db56c08eb
--- /dev/null
+++ b/dev-ml/opam-client/Manifest
@@ -0,0 +1 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
diff --git a/dev-ml/opam-client/metadata.xml b/dev-ml/opam-client/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-client/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/opam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-client/opam-client-2.0.7.ebuild b/dev-ml/opam-client/opam-client-2.0.7.ebuild
new file mode 100644
index 000000000000..7932e576226b
--- /dev/null
+++ b/dev-ml/opam-client/opam-client-2.0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam client libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/opam-state:=
+		dev-ml/opam-file-format:=
+			dev-ml/re:=
+	dev-ml/opam-solver:=
+	dev-ml/cmdliner:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
new file mode 100644
index 000000000000..db4db56c08eb
--- /dev/null
+++ b/dev-ml/opam-core/Manifest
@@ -0,0 +1 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
diff --git a/dev-ml/opam-core/metadata.xml b/dev-ml/opam-core/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/opam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-core/opam-core-2.0.7.ebuild b/dev-ml/opam-core/opam-core-2.0.7.ebuild
new file mode 100644
index 000000000000..6834f2d578d6
--- /dev/null
+++ b/dev-ml/opam-core/opam-core-2.0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+
+inherit opam
+
+DESCRIPTION="Core libraries for opam"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-ml/ocamlgraph:=
+	dev-ml/re:=
+	dev-ml/opam-file-format:=
+	dev-ml/cmdliner:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9)))
+		 (release
+		  (flags (:standard -warn-error -3-9))))
+	EOF
+}
+
+src_compile() {
+	emake -j1 opam-installer
+	emake -j1 ${PN}.install
+}
diff --git a/dev-ml/opam-file-format/Manifest b/dev-ml/opam-file-format/Manifest
new file mode 100644
index 000000000000..a0c353046409
--- /dev/null
+++ b/dev-ml/opam-file-format/Manifest
@@ -0,0 +1 @@
+DIST opam-file-format-2.1.0.tar.gz 23233 BLAKE2B 34d832c5ee13a0db43e77f3b33e7728faa7dccccc8daed50dca89630ab11d6f307413b8fecfef5a7c3e0f7ea04ef27105c8f42d8b5227d2587bdc2c2defe59d3 SHA512 b948545497de0386457a9b5772924572249e38164aa49d5ab2ac9442d1231a56a3b8132a95197d74cbbe34336a7edc04eaca351a8763c4a009a512085ca0ab25
diff --git a/dev-ml/opam-file-format/metadata.xml b/dev-ml/opam-file-format/metadata.xml
new file mode 100644
index 000000000000..bd15aa2f0672
--- /dev/null
+++ b/dev-ml/opam-file-format/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/opam-file-format</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
new file mode 100644
index 000000000000..3adeb20ac869
--- /dev/null
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+MY_PV="${PV/_beta/-beta}"
+MY_PV="${MY_PV/_rc/-rc}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DESCRIPTION="Parser and printer for the opam file syntax"
+HOMEPAGE="https://github.com/ocaml/opam-file-format"
+SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-lang/ocaml:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake byte $(usex ocamlopt native "")
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="$(ocamlc -where)" install
+}
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
new file mode 100644
index 000000000000..db4db56c08eb
--- /dev/null
+++ b/dev-ml/opam-format/Manifest
@@ -0,0 +1 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
diff --git a/dev-ml/opam-format/metadata.xml b/dev-ml/opam-format/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-format/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/opam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-format/opam-format-2.0.7.ebuild b/dev-ml/opam-format/opam-format-2.0.7.ebuild
new file mode 100644
index 000000000000..707e7f657954
--- /dev/null
+++ b/dev-ml/opam-format/opam-format-2.0.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+
+inherit opam
+
+DESCRIPTION="Core libraries for opam"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-ml/opam-core:=
+		dev-ml/re:=
+	dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9)))
+		 (release
+		  (flags (:standard -warn-error -3-9))))
+	EOF
+}
+
+src_compile() {
+	emake -j1 opam-installer
+	emake -j1 ${PN}.install
+}
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
new file mode 100644
index 000000000000..b9416004a3a1
--- /dev/null
+++ b/dev-ml/opam-installer/Manifest
@@ -0,0 +1 @@
+DIST opam-full-2.0.7.tar.gz 7929123 BLAKE2B 100acc2c31e97e47b0b584f3a153283593351d49d5e9cdaca42fdcc025b135d9538bd327927950e7e0972b20f561a0ee3d1d1b5b4b87e1e6af31761e311081e7 SHA512 670af4935bba0679c65f6592b7a52b1d429b604eb261e40b13cf72312aeb0bab0c5a76829a555fc5379a0371c352692cbabc46b460fcd9bf32b3cfebdaeceb81
diff --git a/dev-ml/opam-installer/metadata.xml b/dev-ml/opam-installer/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-installer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/opam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7.ebuild b/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
new file mode 100644
index 000000000000..c95fa47e7079
--- /dev/null
+++ b/dev-ml/opam-installer/opam-installer-2.0.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# We are opam
+OPAM_INSTALLER_DEP=" "
+OPAM_SKIP_VALIDATION=yes
+
+inherit opam
+
+DESCRIPTION="Core installer for opam packages"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ocaml-4.02.3"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/opam-full-${PV/_/-}"
+OPAM_INSTALLER="${S}/opam-installer"
+
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/usr" \
+		--with-mccs \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--mandir="${EPREFIX}/usr/share/man"
+}
+
+src_compile() {
+	sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
+	emake lib-ext
+	#passing -jX to the dune build leads to errors
+	#see: https://github.com/ocaml/opam/issues/3585
+	emake DUNE_PROMOTE_ARG="" -j1
+}
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
new file mode 100644
index 000000000000..db4db56c08eb
--- /dev/null
+++ b/dev-ml/opam-repository/Manifest
@@ -0,0 +1 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
diff --git a/dev-ml/opam-repository/metadata.xml b/dev-ml/opam-repository/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-repository/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/opam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-repository/opam-repository-2.0.7.ebuild b/dev-ml/opam-repository/opam-repository-2.0.7.ebuild
new file mode 100644
index 000000000000..c9a82d48c78c
--- /dev/null
+++ b/dev-ml/opam-repository/opam-repository-2.0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam repository libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/opam-format:=
+		dev-ml/re:=
+	dev-ml/dose3:=
+	dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+RESTRICT="test"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
new file mode 100644
index 000000000000..db4db56c08eb
--- /dev/null
+++ b/dev-ml/opam-solver/Manifest
@@ -0,0 +1 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
diff --git a/dev-ml/opam-solver/metadata.xml b/dev-ml/opam-solver/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-solver/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/opam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-solver/opam-solver-2.0.7.ebuild b/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
new file mode 100644
index 000000000000..392000ef9f25
--- /dev/null
+++ b/dev-ml/opam-solver/opam-solver-2.0.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam solver"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt test"
+
+RDEPEND="
+	dev-ml/opam-format:=
+		dev-ml/opam-file-format:=
+		dev-ml/re:=
+	>=dev-ml/mccs-1.1.4:=
+	dev-ml/dose3:=
+	dev-ml/cudf:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/opam-client )"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
new file mode 100644
index 000000000000..db4db56c08eb
--- /dev/null
+++ b/dev-ml/opam-state/Manifest
@@ -0,0 +1 @@
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
diff --git a/dev-ml/opam-state/metadata.xml b/dev-ml/opam-state/metadata.xml
new file mode 100644
index 000000000000..970e090f0dfd
--- /dev/null
+++ b/dev-ml/opam-state/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/opam</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-state/opam-state-2.0.7.ebuild b/dev-ml/opam-state/opam-state-2.0.7.ebuild
new file mode 100644
index 000000000000..b7cf8888bd49
--- /dev/null
+++ b/dev-ml/opam-state/opam-state-2.0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="opam state libraries"
+HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/opam-repository:=
+		dev-ml/re:=
+	dev-ml/opam-file-format:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+RESTRICT="test"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 360c3df63cfc..9556c2492a09 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -1 +1,2 @@
 DIST opam-1.3.1.tar.gz 669485 BLAKE2B e1aed54175d46f5dd9fd989e56c25657370356e26df6976c01dd089e381291fa04e25da295104f85d513010cd028276d80ebf7a4a77b38f3e089e52f4e64f43a SHA512 d075c9b2c9670d712f29bd2df34b8020da52041fa2bbef599cb54a81f63554507d78bebece45ecf668d3d1d4ed514e4ab88a1d86b64088d283bca7a8e75ae582
+DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
diff --git a/dev-ml/opam/metadata.xml b/dev-ml/opam/metadata.xml
index 9d94a67c8e6c..970e090f0dfd 100644
--- a/dev-ml/opam/metadata.xml
+++ b/dev-ml/opam/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">ocaml/opam</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/opam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/opam/opam-2.0.7.ebuild b/dev-ml/opam/opam-2.0.7.ebuild
new file mode 100644
index 000000000000..4fa567962d7a
--- /dev/null
+++ b/dev-ml/opam/opam-2.0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A source-based package manager for OCaml"
+HOMEPAGE="http://opam.ocaml.org/"
+SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/cmdliner:=
+	dev-ml/cudf:=
+	dev-ml/dose3:=
+	dev-ml/extlib:=
+	dev-ml/opam-client:=
+	dev-ml/opam-file-format:=
+	dev-ml/re:="
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/opam-${PV/_/-}"
+
+src_prepare() {
+	default
+	cat <<- EOF >> "${S}/dune"
+		(env
+		 (dev
+		  (flags (:standard -warn-error -3-9-33)))
+		 (release
+		  (flags (:standard -warn-error -3-9-33))))
+	EOF
+}
diff --git a/dev-ml/ounit2/Manifest b/dev-ml/ounit2/Manifest
new file mode 100644
index 000000000000..1110f73cdc23
--- /dev/null
+++ b/dev-ml/ounit2/Manifest
@@ -0,0 +1 @@
+DIST ounit-v2.2.3.tbz 57449 BLAKE2B cf4742c4800ff66551416e243285ae0264f94d1665f795039cd37ad717b09fa3ba5cdfb2380169dfcddea5a27a82373ae892adf11155147a081d734091bf39d8 SHA512 dff04859d263e5f80a1606156d07493d0320a2756d0a7f134c63c53078550c7b056587486922bc66a288413af30c59a7e47157636502c6dd10626cf75587f981
diff --git a/dev-ml/ounit2/metadata.xml b/dev-ml/ounit2/metadata.xml
new file mode 100644
index 000000000000..3084165d7481
--- /dev/null
+++ b/dev-ml/ounit2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gildor478/ounit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/ounit2/ounit2-2.2.3.ebuild b/dev-ml/ounit2/ounit2-2.2.3.ebuild
new file mode 100644
index 000000000000..cd2e966fe700
--- /dev/null
+++ b/dev-ml/ounit2/ounit2-2.2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Unit testing framework for OCaml"
+HOMEPAGE="https://github.com/gildor478/ounit"
+SRC_URI="https://github.com/gildor478/ounit/releases/download/v${PV}/ounit-v${PV}.tbz"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+DEPEND="
+	dev-ml/lwt:=
+	dev-ml/stdlib-shims:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+IUSE="+ocamlopt"
+
+S="${WORKDIR}/ounit-v${PV}"
diff --git a/dev-ml/parsexp/Manifest b/dev-ml/parsexp/Manifest
new file mode 100644
index 000000000000..36d1d62ef689
--- /dev/null
+++ b/dev-ml/parsexp/Manifest
@@ -0,0 +1 @@
+DIST parsexp-0.14.0.tar.gz 48617 BLAKE2B eba36c17f08b59ed7601c4f9906e80de45e377d0134fdee30b5536c3d91af0cb45a1cdab90333498da8bf3fcf5e5bea16a8f734e7f1a92c9b865cd3136a668c2 SHA512 d9e9ea936dcf23d700e6ddd4153a2a96df6819094eaebe15d949c4569fa5125ab308af2c10f4ba2161610d8673eeb3928dd19c10a21974c140e4c89537a86575
diff --git a/dev-ml/parsexp/metadata.xml b/dev-ml/parsexp/metadata.xml
new file mode 100644
index 000000000000..45889fd58f9d
--- /dev/null
+++ b/dev-ml/parsexp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/parsexp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/parsexp/parsexp-0.14.0.ebuild b/dev-ml/parsexp/parsexp-0.14.0.ebuild
new file mode 100644
index 000000000000..e8c21c548d86
--- /dev/null
+++ b/dev-ml/parsexp/parsexp-0.14.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="S-expression parsing library "
+HOMEPAGE="https://github.com/janestreet/parsexp"
+SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/sexplib0:=
+	dev-ml/base:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/ppx_assert/Manifest b/dev-ml/ppx_assert/Manifest
index c5ef535aaafb..6df7f4f0d9a9 100644
--- a/dev-ml/ppx_assert/Manifest
+++ b/dev-ml/ppx_assert/Manifest
@@ -1 +1,2 @@
+DIST ppx_assert-0.14.0.tar.gz 7239 BLAKE2B 730d1cceee88728291473e73120cc1ae19477927c8f5e20b1a455ab78e34c5917907a60e03ea7d2b898ccb99e42755f1ad918d7fa59ae64bac84fd8356af7647 SHA512 b8ae4a1f08e9110f0809f98d1e0126d50101db7c5b87aa166294aed29df420a079fd2c0797c2888718acd8cd4f2aaaa98f0c445e5fb1423325cc89801e7d52b1
 DIST ppx_assert-0.9.0.tar.gz 9419 BLAKE2B 7e6ea363182ce3f057e54ae54e2d7b3236d909a748c74ee79209d97de001bf1df1934bccc95bf93e674aedd5c5f5029748747242acb1246f1f08a02f8b9b6309 SHA512 4debf617f1b0244d306b65d72cbf04f4a820a8d9433180d462ff462d2bf6eb01643897cc35de75d435fedfa1bf8266263c0e73328f02b5c957a3423eb535925f
diff --git a/dev-ml/ppx_assert/metadata.xml b/dev-ml/ppx_assert/metadata.xml
index 40b93dd331cd..b83f7118873b 100644
--- a/dev-ml/ppx_assert/metadata.xml
+++ b/dev-ml/ppx_assert/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_assert</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
new file mode 100644
index 000000000000..8b49e9bb3e83
--- /dev/null
+++ b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Assert-like extension nodes that raise useful errors on failure"
+HOMEPAGE="https://github.com/janestreet/ppx_assert"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_cold:=
+	dev-ml/ppx_compare:=
+	dev-ml/ppx_here:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_base/Manifest b/dev-ml/ppx_base/Manifest
index 94668780256a..de910581bf9c 100644
--- a/dev-ml/ppx_base/Manifest
+++ b/dev-ml/ppx_base/Manifest
@@ -1 +1,2 @@
+DIST ppx_base-0.14.0.tar.gz 2953 BLAKE2B d62187d4b359dab01f88054ffb53a434402af022849a633749f3d60b625967a30b6c2ef58b838ef2ee6261d675da60f03d062ae1dc8391d5a4f0bb9cb3d719b0 SHA512 d41f36e3ddec7bdffaa93d8ec4110a197ef4d4af4f9173e060b0f1c5d9c95a33ee13379e41dc027f1103faea3b8ec4e314387b0844a7fcb78d0770ffa44c99e8
 DIST ppx_base-0.9.0.tar.gz 5255 BLAKE2B ba5d1670ba0da8c13c30dab65885cb9d406d7259ca57841867f4b2c7720f8202fb34074b5bc8f03cb0858427c79e61d4a33098c846c61ebcc98d40799ced9274 SHA512 660f6b210eb6d7bd33c279ffa8bbf01c21b9db5d7827cf6fded8c52e8d4f2f5468a76c2eab86c2b868ac859bbc81db7189c71ccc1701bf57030f82d8eda4339e
diff --git a/dev-ml/ppx_base/metadata.xml b/dev-ml/ppx_base/metadata.xml
index 7f767d650dc4..9949f15ae8cc 100644
--- a/dev-ml/ppx_base/metadata.xml
+++ b/dev-ml/ppx_base/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_base</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_base/ppx_base-0.14.0.ebuild b/dev-ml/ppx_base/ppx_base-0.14.0.ebuild
new file mode 100644
index 000000000000..f5147aae0610
--- /dev/null
+++ b/dev-ml/ppx_base/ppx_base-0.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Base set of ppx rewriters"
+HOMEPAGE="https://github.com/janestreet/ppx_base"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/ppx_compare:=
+	dev-ml/ppx_enumerate:=
+	dev-ml/ppx_hash:=
+	dev-ml/ppx_js_style:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_cold:=
+	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/ppxlib:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_bench/Manifest b/dev-ml/ppx_bench/Manifest
index c69dda276198..eeb873193712 100644
--- a/dev-ml/ppx_bench/Manifest
+++ b/dev-ml/ppx_bench/Manifest
@@ -1 +1,2 @@
+DIST ppx_bench-0.14.1.tar.gz 9132 BLAKE2B d8590c0b80bbde553ec28514017df6f5deaf93fc693f3c1f102a0ad1f7e616a9308b51d0fb2535f1f8279ddfb9760bdf6b546acaa06bf6181848b3f93771061d SHA512 f359ebf33b1efe91dad9c844a16a0629cd079423a10da39d093af1e1d3c94872328de9a9272a741bf8f4bca5945556d5bc70a0f8994886a934eb933959c5db63
 DIST ppx_bench-0.9.1.tar.gz 11097 BLAKE2B cdf7cd97a1ce702c75aa87a717b5d7905931571c0b000cef5a4af29e18f15c22adbf4882ef5453ddd97def6b5ea7885835dc69237e70e13138670a5ced4c966b SHA512 1963525719178e34f50ee8dbe3cabe8582ffc08835e542d1ae593d6a250d4f841be53c96fbc203d620e11f9ad2a9f591e545656c3b254bd60db614ec1e06947d
diff --git a/dev-ml/ppx_bench/metadata.xml b/dev-ml/ppx_bench/metadata.xml
index 04fcf9da109a..8101d49c7a8c 100644
--- a/dev-ml/ppx_bench/metadata.xml
+++ b/dev-ml/ppx_bench/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_bench</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild b/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild
new file mode 100644
index 000000000000..ca335f8eea76
--- /dev/null
+++ b/dev-ml/ppx_bench/ppx_bench-0.14.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Syntax extension for writing in-line benchmarks in ocaml code"
+HOMEPAGE="https://github.com/janestreet/ppx_bench"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/ppx_inline_test:=
+	dev-ml/ppxlib:=
+		dev-ml/stdio:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_bin_prot/Manifest b/dev-ml/ppx_bin_prot/Manifest
index 607ba8a10fe6..becb10f7494c 100644
--- a/dev-ml/ppx_bin_prot/Manifest
+++ b/dev-ml/ppx_bin_prot/Manifest
@@ -1 +1,2 @@
+DIST ppx_bin_prot-0.14.0.tar.gz 36642 BLAKE2B 6a80f574fad5e3ba2bb1adad8e6af86a9bd463ab7ed8976901234694a56f9e17c04ccc74f0bd4a18c75f1a4ccd81848218078bb387f8ff2f5df337c5f2492226 SHA512 7d61624d18fd76daed5a5d60d16ac0a3fd658ef650ee6ae4b65346e96d1718a044deb3ca6fbb63c69176505f64d0d1b6becd8419061cfb69466d45e16964329b
 DIST ppx_bin_prot-0.9.0.tar.gz 35234 BLAKE2B 883e7d8b3919d640408fd1efa22df6656d1146d2771313ee29bda287f8ec412b4acdabebb8ea3548918370a6048543b93e17b22141ac672a4b8c628d0c678844 SHA512 f900741f4caeec86ec9d73a086ffeec21789bdd99ca7b09a808a3e281038d587c9c326cc1217957fcd828c4e1da5902f6dee3bf4ba7a22feca5424573215a00c
diff --git a/dev-ml/ppx_bin_prot/metadata.xml b/dev-ml/ppx_bin_prot/metadata.xml
index 7a2f01fd7a1f..1854dc854561 100644
--- a/dev-ml/ppx_bin_prot/metadata.xml
+++ b/dev-ml/ppx_bin_prot/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_bin_prot</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
new file mode 100644
index 000000000000..942eef12f2db
--- /dev/null
+++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-0.14.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Generation of bin_prot readers and writers from types"
+HOMEPAGE="https://github.com/janestreet/ppx_bin_prot"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt test"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/bin_prot:=
+	dev-ml/ppx_here:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+	"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/ppx_jane
+	)"
diff --git a/dev-ml/ppx_cold/Manifest b/dev-ml/ppx_cold/Manifest
new file mode 100644
index 000000000000..71ac9e7d2bb7
--- /dev/null
+++ b/dev-ml/ppx_cold/Manifest
@@ -0,0 +1 @@
+DIST ppx_cold-0.14.0.tar.gz 3778 BLAKE2B 5ae223047858ff11f90067fcb2a6541c964cd929e45fe9d43256b75a81599d6aa0aaf37fe7274e98c64b6448846ab8c64b1c092171392f74a395ea08ea0a60d8 SHA512 3655602defe6b5cd9740eb4cfcf480eded6912674df28955502adcd0d8d6901551e137b0660a389f8be2c88b3aebc830f57089d2ac1a82f7b9efdbaea358fe07
diff --git a/dev-ml/ppx_cold/metadata.xml b/dev-ml/ppx_cold/metadata.xml
new file mode 100644
index 000000000000..fce837d2f493
--- /dev/null
+++ b/dev-ml/ppx_cold/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/ppx_cold</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild b/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild
new file mode 100644
index 000000000000..ef1ca36fc0d5
--- /dev/null
+++ b/dev-ml/ppx_cold/ppx_cold-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Expands [@cold] into [@inline never][@specialise never][@local never]"
+HOMEPAGE="https://github.com/janestreet/ppx_cold"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+		dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_compare/Manifest b/dev-ml/ppx_compare/Manifest
index 123942822bc3..22f6d98ca857 100644
--- a/dev-ml/ppx_compare/Manifest
+++ b/dev-ml/ppx_compare/Manifest
@@ -1 +1,2 @@
+DIST ppx_compare-0.14.0.tar.gz 13614 BLAKE2B 081e91192f987095a773964b56838b05fb18ea23599eeeb28d297ac81ff7439067ffa0941cf4d64921abad68f9dca90560463b9f059f35ed3147333ba697a88c SHA512 be02c8114e0915439c04b3d796029ad124e9a2e637032d6a86a41c03b81985cb0f68f65bc43c1d12221b521f6fa10006a105b3ffe95e991ed9695692fd0763cb
 DIST ppx_compare-0.9.0.tar.gz 11760 BLAKE2B 8db18a56185371e56addddeac4ec94e1260f06edc7dbc835efcf2f6788f42c36746858fd96e7fc94aaaf52b118a95581388276b90d8d489a9f4707af2c157811 SHA512 4f154bb67c2241712986247f8b3ed04b4ba874424171989f0421193a15cea45dedbf1c546408421bf33839ea45b85a45ec1cb43c034373fd80198ddb5d9045fe
diff --git a/dev-ml/ppx_compare/metadata.xml b/dev-ml/ppx_compare/metadata.xml
index beacad414601..5bc9e8d7dd51 100644
--- a/dev-ml/ppx_compare/metadata.xml
+++ b/dev-ml/ppx_compare/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_compare</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild b/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild
new file mode 100644
index 000000000000..c423bee51e7b
--- /dev/null
+++ b/dev-ml/ppx_compare/ppx_compare-0.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Generation of comparison functions from types"
+HOMEPAGE="https://github.com/janestreet/ppx_compare"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ocaml-migrate-parsetree:=
+		dev-ml/result:=
+	dev-ml/ppxlib:=
+"
+
+RDEPEND="${DEPEND}"
+
+# Error: No rule found for test/comparelib_test__Check_optims.o
+RESTRICT=test
diff --git a/dev-ml/ppx_custom_printf/Manifest b/dev-ml/ppx_custom_printf/Manifest
index d71f4fa73f8c..910e402a2a34 100644
--- a/dev-ml/ppx_custom_printf/Manifest
+++ b/dev-ml/ppx_custom_printf/Manifest
@@ -1 +1,2 @@
+DIST ppx_custom_printf-0.14.0.tar.gz 9600 BLAKE2B 7b921188e158d59a160502b410ac780709b40fd408cf2e06a0adb70952ef3e72144deaee1c40df512cc09997ce87621e0be2a32d28e8408914fb90f3416e0532 SHA512 2f607df87aa372ef602b4aeb44a2d697ff8696001161e544398c3675280ef7af402f4b34b8cfce900791129d2a9db13ccbf4e73518f58487adc47d5188c8652c
 DIST ppx_custom_printf-0.9.0.tar.gz 11527 BLAKE2B ad1791f1bad3c8583e67ca6300e98e8a7a047f723bbaa7c80cf6224f7333e7893fce7289456c39f6959089f15cc0da20106b33689ab198b1f47f6dc0bd853c77 SHA512 7608e09aac26f4f51d124d30c25a510abb73bea606007524a5563f5bb2c0e71f1ff033edb32c48f0c69656e8c3924b57186639812b1a647ce31f7ae15dc466cb
diff --git a/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..95cd58aee4cd
--- /dev/null
+++ b/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch
@@ -0,0 +1,41 @@
+commit 50f8f706e868f8ebac4f2f1392365f994d674463 (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date:   Mon Oct 5 17:56:52 2020 +0200
+
+    Make ppx_custom_printf compatible with ppxlib.0.18.0
+    
+    ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+    in string constants representation. This PR makes ppx_custom_printf
+    compatible with the latest ppxlib.
+    
+    You might want for the actual release of ppxlib.0.18.0 before merging
+    this!
+    
+    Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/ppx_custom_printf.opam b/ppx_custom_printf.opam
+index 80ea710..1cc3d11 100644
+--- a/ppx_custom_printf.opam
++++ b/ppx_custom_printf.opam
+@@ -15,7 +15,7 @@ depends: [
+   "base"          {>= "v0.14" & < "v0.15"}
+   "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
+   "dune"          {>= "2.0.0"}
+-  "ppxlib"        {>= "0.11.0"}
++  "ppxlib"        {>= "0.18.0"}
+ ]
+ synopsis: "Printf-style format-strings for user-defined string conversion"
+ description: "
+diff --git a/src/ppx_custom_printf.ml b/src/ppx_custom_printf.ml
+index 18ad7fd..e9ad8b3 100644
+--- a/src/ppx_custom_printf.ml
++++ b/src/ppx_custom_printf.ml
+@@ -264,7 +264,7 @@ let expand_format_string ~loc fmt_string =
+ let expand e =
+   match e.pexp_desc with
+   | Pexp_apply ({ pexp_attributes = ident_attrs; _ },
+-                [ (Nolabel, { pexp_desc = Pexp_constant (Pconst_string (str, _))
++                [ (Nolabel, { pexp_desc = Pexp_constant (Pconst_string (str, _, _))
+                             ; pexp_loc = loc; pexp_loc_stack = _
+                             ; pexp_attributes = str_attrs }) ]) ->
+     assert_no_attributes ident_attrs;
diff --git a/dev-ml/ppx_custom_printf/metadata.xml b/dev-ml/ppx_custom_printf/metadata.xml
index db6f32d8ab1d..bd8c830ce5d7 100644
--- a/dev-ml/ppx_custom_printf/metadata.xml
+++ b/dev-ml/ppx_custom_printf/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_custom_printf</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild
new file mode 100644
index 000000000000..7915067e7656
--- /dev/null
+++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.14.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Printf-style format-strings for user-defined string conversion"
+HOMEPAGE="https://github.com/janestreet/ppx_custom_printf"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_sexp_conv:=
+	>=dev-ml/ppxlib-0.18.0:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_derivers/Manifest b/dev-ml/ppx_derivers/Manifest
index 535fb7fce0c3..45a09a38f555 100644
--- a/dev-ml/ppx_derivers/Manifest
+++ b/dev-ml/ppx_derivers/Manifest
@@ -1 +1,2 @@
 DIST ppx_derivers-1.0.tar.gz 1467 BLAKE2B 94946c5d04e314bfbe146534fb19e88a16670dc3f5d47c15496142dd9a256ebbe4387f24a9fe31b1aee804d064bea0a9136685372399a38ac82dedafe677934a SHA512 2e2437094362088f9a1601ca3c2f0b82ec079b9a34e502234aef36158ea7a3f2236f1d2526df1a75bcb851346ebaaf717eaf72253935f7ea4024d3dc20512e85
+DIST ppx_derivers-1.2.1.tar.gz 2530 BLAKE2B d0a8a214e93908cfff1d418fe1b729a7ca502fb6dc983d3a837f6846aec891627457df72a610736d929c83622202bd5a00451c1c24510a642b4c133ce60416b8 SHA512 ef0796fe2592e653d34ba01d206d4b507429882a2aaadcb89c7f807c33a417f2871b0c94ade5c92aefd9487daa582e19d88ad5a5eaa631e8162ae12f4a0756c6
diff --git a/dev-ml/ppx_derivers/metadata.xml b/dev-ml/ppx_derivers/metadata.xml
index 8cefe9903afe..60ca2c998ff0 100644
--- a/dev-ml/ppx_derivers/metadata.xml
+++ b/dev-ml/ppx_derivers/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">diml/ppx_derivers</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild b/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild
new file mode 100644
index 000000000000..9db1aabf04a8
--- /dev/null
+++ b/dev-ml/ppx_derivers/ppx_derivers-1.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Shared [@@deriving] plugin registry"
+HOMEPAGE="https://github.com/diml/ppx_derivers"
+SRC_URI="https://github.com/diml/ppx_derivers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index efe85125d052..23ba45711d2c 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1 +1,2 @@
 DIST ppx_deriving-4.2.tar.gz 48327 BLAKE2B 8ce5ccbfb7992fbd5e9c777ad0b577f8846d92df21926a877fb8f7b6804acc4fa2fd78586fc209c3bd83b8496eb6f8e8ee37c39e0c7462fb55f39389356f3c8f SHA512 084526157d6f4b41f7ad73157c5edb54d5bb9130d706525031670d8495ede8af5545302f442c2d2c506772201b79ccc93bdc7fead9455d3a59977ddfa9c3284d
+DIST ppx_deriving-4.5.tar.gz 45886 BLAKE2B 257bacda986a3830e3efd55b8e97d8c633b64740a36c7954c7b13ef42578fef8795f268e709a2b7285fa3dda1297afe7cfcc277da8557ed654dda6401a550680 SHA512 f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b
diff --git a/dev-ml/ppx_deriving/metadata.xml b/dev-ml/ppx_deriving/metadata.xml
index ee4d37328cad..0fea406d5fda 100644
--- a/dev-ml/ppx_deriving/metadata.xml
+++ b/dev-ml/ppx_deriving/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ocaml-ppx/ppx_deriving</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild
new file mode 100644
index 000000000000..a33144c264b6
--- /dev/null
+++ b/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Type-driven code generation for OCaml"
+HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving"
+SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+
+DEPEND="
+	dev-ml/ppx_tools:=
+	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/ppx_derivers:=
+	dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-ml/cppo
+	dev-ml/ppxfind
+	test? ( dev-ml/ounit2 )"
+PATCHES=( "${FILESDIR}/ounit2.patch" )
diff --git a/dev-ml/ppx_driver/Manifest b/dev-ml/ppx_driver/Manifest
index 325593ac132b..81ae2e9ea42a 100644
--- a/dev-ml/ppx_driver/Manifest
+++ b/dev-ml/ppx_driver/Manifest
@@ -1 +1,2 @@
+DIST ppx_driver-0.11.0.tar.gz 9157 BLAKE2B 053e710c3d8cb6096c893bd5308fbe2b4563dfb2de3c006402ae363aed60db31a3bb1b7656f0565ce13d88368d8b6bef68658f81190dda397562d462828618f4 SHA512 d7ef318f6f0c6e4c56537584bb50b6673b294b67ac264208b7c8b4bcc9d0ca6baf1cbea752459b12d9102bb84a392047c907c65afd23760cac1cc4465ed85ea9
 DIST ppx_driver-0.9.1.tar.gz 28637 BLAKE2B d787ac91713bd750d2d2bde5830df3abb1a07be6672000d7a6de6c125a7627e7a5b94aa9f8f87e2c6c57a7a92073c44e18c7285575aad02f5db9c7b4419647d8 SHA512 1e3647e34fb9e6d44b783fae1fce21413e5591f8934c3d2ddac3d1b37019b0d95117c8d64abf14cbfe4f67147612371ec1eb76b477763b062206ffc9b46688d7
diff --git a/dev-ml/ppx_driver/metadata.xml b/dev-ml/ppx_driver/metadata.xml
index 305fe7348cce..c69342dd5815 100644
--- a/dev-ml/ppx_driver/metadata.xml
+++ b/dev-ml/ppx_driver/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_driver</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild b/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild
new file mode 100644
index 000000000000..e4d80f93c0de
--- /dev/null
+++ b/dev-ml/ppx_driver/ppx_driver-0.11.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Feature-full driver for OCaml AST transformers"
+HOMEPAGE="https://github.com/janestreet/ppx_driver"
+SRC_URI="https://github.com/janestreet/ppx_driver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_enumerate/Manifest b/dev-ml/ppx_enumerate/Manifest
index 425aba98d5da..8b8b6de65a95 100644
--- a/dev-ml/ppx_enumerate/Manifest
+++ b/dev-ml/ppx_enumerate/Manifest
@@ -1 +1,2 @@
+DIST ppx_enumerate-0.14.0.tar.gz 9487 BLAKE2B 7f87a1c9c2ae0b365b5fdc44b906ef5330e28586aea741ca51dcddd8b0cf591e28f59e21d4050078c42072b96a96e5c6430d5ade4334d49aeec142db058ee3fc SHA512 d7f61ba792af81395c76e51bcb81b467ae4b67fdc3022d2e55ab0682bb4710e9a96852457721567a9f13606bd4290dbac8fd34421b0dffbabdd9debd1268ecc5
 DIST ppx_enumerate-0.9.0.tar.gz 10967 BLAKE2B a5e742c5009c16d07cb23d7fba8cd4d41cd3f2ec543f47fce65c3731bb81b140a601ec492c0f5f8a5a62c2ac64f41a8093a7e5c96b251ad3b85944aab19c167c SHA512 46e979528af75313fcbfee4d1437156ded90d46f7608271a77ad41bb7e087e2ea4f61f534624b23679c4edf812d2fcfe26b9b634c3fcb691e2da2388ae04950c
diff --git a/dev-ml/ppx_enumerate/metadata.xml b/dev-ml/ppx_enumerate/metadata.xml
index 42deaa7b6871..0691d2ad6671 100644
--- a/dev-ml/ppx_enumerate/metadata.xml
+++ b/dev-ml/ppx_enumerate/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_enumerate</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild b/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild
new file mode 100644
index 000000000000..047e4589d631
--- /dev/null
+++ b/dev-ml/ppx_enumerate/ppx_enumerate-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Generate a list containing all values of a finite type"
+HOMEPAGE="https://github.com/janestreet/ppx_enumerate"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
index 4d417a085e81..c6b1189dc2e0 100644
--- a/dev-ml/ppx_expect/Manifest
+++ b/dev-ml/ppx_expect/Manifest
@@ -1 +1,2 @@
+DIST ppx_expect-0.14.0.tar.gz 45661 BLAKE2B 0cba3840743d45f0f11936f090319aab3237c7a14389eb6d035a3b7cdac91e0b169c3ed84407e1bb01a00738bf97b62dba313965e93a2177388666764fe5854b SHA512 7de5d84640d16101d38140b5f621301c9935e3161a7c7d978373940be92fa7f14cad429e79eec294a20d1f379e969cf3c25d15810f1a4d3ad1bb8ba0eb7d7109
 DIST ppx_expect-0.9.0.tar.gz 33700 BLAKE2B f03d1183b12efe84016a15b6a6b45b7bef93b23bc4d470c2796361aca2be229fc9447103c0a31d95a94f6c05bbabf1cbe9d138dc3518df9f505b6b009eefb104 SHA512 b8a6941f3ac0dea2167d7fe5c61e7adf605f5399e11049b5c9f22c613182983a014d05c2fb16e7a2dc94dbccf445e1801c39a89e6d995b5599cb40ee4322148e
diff --git a/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..f30da03701ba
--- /dev/null
+++ b/dev-ml/ppx_expect/files/ppx_expect-0.14.0-ppxlib-0.18.0.patch
@@ -0,0 +1,42 @@
+commit 7f46c2d22a87b99c70a220c1b13aaa34c6d217ff (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date:   Mon Oct 5 17:46:34 2020 +0200
+
+    Make ppx_expect compatible with ppxlib.0.18.0
+    
+    ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+    in string constants representation. This PR makes ppx_expect
+    compatible with the latest ppxlib.
+    
+    You might want for the actual release of ppxlib.0.18.0 before merging
+    this!
+    
+    Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/expect_payload/ppx_expect_payload.ml b/expect_payload/ppx_expect_payload.ml
+index 23a12e1..fd2a5bb 100644
+--- a/expect_payload/ppx_expect_payload.ml
++++ b/expect_payload/ppx_expect_payload.ml
+@@ -86,7 +86,7 @@ let make ~kind payload ~(extension_id_loc : Location.t) =
+ let pattern () =
+   Ast_pattern.(
+     map
+-      (single_expr_payload (pexp_loc __ (pexp_constant (pconst_string __ __))))
+-      ~f:(fun f loc s tag -> f (Some (loc, s, tag)))
++      (single_expr_payload (pexp_loc __ (pexp_constant (pconst_string __ __ __))))
++      ~f:(fun f loc s _loc tag -> f (Some (loc, s, tag)))
+     ||| map (pstr nil) ~f:(fun f -> f None))
+ ;;
+diff --git a/ppx_expect.opam b/ppx_expect.opam
+index dcce541..59adadb 100644
+--- a/ppx_expect.opam
++++ b/ppx_expect.opam
+@@ -17,7 +17,7 @@ depends: [
+   "ppx_inline_test" {>= "v0.14" & < "v0.15"}
+   "stdio"           {>= "v0.14" & < "v0.15"}
+   "dune"            {>= "2.0.0"}
+-  "ppxlib"          {>= "0.11.0"}
++  "ppxlib"          {>= "0.18.0"}
+   "re"              {>= "1.8.0"}
+ ]
+ synopsis: "Cram like framework for OCaml"
diff --git a/dev-ml/ppx_expect/metadata.xml b/dev-ml/ppx_expect/metadata.xml
index e40e4cf098df..ec7beb371c4d 100644
--- a/dev-ml/ppx_expect/metadata.xml
+++ b/dev-ml/ppx_expect/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_expect</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
new file mode 100644
index 000000000000..4655a60d8ef7
--- /dev/null
+++ b/dev-ml/ppx_expect/ppx_expect-0.14.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Cram like framework for OCaml"
+HOMEPAGE="https://github.com/janestreet/ppx_expect"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_assert:=
+	dev-ml/ppx_compare:=
+	dev-ml/ppx_custom_printf:=
+	dev-ml/ppx_fields_conv:=
+	dev-ml/ppx_here:=
+	dev-ml/ppx_inline_test:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_variants_conv:=
+	dev-ml/stdio:=
+	>=dev-ml/ppxlib-0.18.0:=
+		dev-ml/ocaml-compiler-libs:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+	dev-ml/re:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/ppx_jane
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_fail/Manifest b/dev-ml/ppx_fail/Manifest
index 33bc7dfacbfe..49b65277bb9d 100644
--- a/dev-ml/ppx_fail/Manifest
+++ b/dev-ml/ppx_fail/Manifest
@@ -1 +1,2 @@
+DIST ppx_fail-0.14.0.tar.gz 3773 BLAKE2B ef5c7a84808045a9b9ddb78556061ec0d9b04f5b08d5cb4096c353d0e38aa3bca360538efe53cf5faffad6628634d689504c063bbb563790c15a4f3d327f8c14 SHA512 a683430e5cdb50b52846b45d0e25a7b2498f14f34153319cb3ffd30e7b6e493f36790ffc5ea82ec3fbb0281a29e13bb2df10a1754ec32f0e5faad0890b6d211e
 DIST ppx_fail-0.9.0.tar.gz 5908 BLAKE2B 671d6c565ffef4582600346642d64884706c9f5bbff114868b0069f82abea3241c44bd92472e40b11365a560335efac59f2a93ab993d19cf98c2a3da09c5968d SHA512 43bd13d5e41f7a297da2c67b032b9d88b94ab2ef152f756738e2bab41aa22829ec3a17d2824243e5194c4d2ee9ea567f06a638172f8c77ca7c466a641da8017a
diff --git a/dev-ml/ppx_fail/metadata.xml b/dev-ml/ppx_fail/metadata.xml
index e8071816757a..35728b324db4 100644
--- a/dev-ml/ppx_fail/metadata.xml
+++ b/dev-ml/ppx_fail/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_fail</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild b/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild
new file mode 100644
index 000000000000..c13ee021e4ff
--- /dev/null
+++ b/dev-ml/ppx_fail/ppx_fail-0.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Add location to calls to failwiths"
+HOMEPAGE="https://github.com/janestreet/ppx_fail"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_here:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_fields_conv/Manifest b/dev-ml/ppx_fields_conv/Manifest
index b9d9329abf20..61f525af8478 100644
--- a/dev-ml/ppx_fields_conv/Manifest
+++ b/dev-ml/ppx_fields_conv/Manifest
@@ -1 +1,2 @@
+DIST ppx_fields_conv-0.14.1.tar.gz 14348 BLAKE2B 09bd2db4dab314ba50bcd5566c4ba4fd834fc34ba15be2132d5cbe3c27e5c76e37b4cccd3bc4cc4a5bd930f95215f6100557b89e44d54e906e382381be1fe257 SHA512 afd0f16b851e2984e46ac1d9347268a1cdb9a9054ea18435a5030dd512ba56f97b54639cc6cc6254498ca3fd2fa4d5c0053c7f2ceddd531ebbd9afef5b5f3e3d
 DIST ppx_fields_conv-0.9.0.tar.gz 15171 BLAKE2B 5a0051a1b362dcf15ddd4ec4f3f6f4df6d709a8c2709222a2d2502eb12b8728fb28ce9213a1789270d30505c6084ab8203dc7b49d7043d9820aabb0cc74c51c2 SHA512 1edcd7076c1dbba84b86f05624b3792404b24ae4414ee0c3b32dcfc998da77a2a9d52d063fefc24be21d98472d6f58880c37ac29c610fb5b8a401224fc654ec1
diff --git a/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch b/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..23b5a8be82c2
--- /dev/null
+++ b/dev-ml/ppx_fields_conv/files/ppx_fields_conv-0.14.1-ppxlib-0.18.0.patch
@@ -0,0 +1,60 @@
+commit f3c6846ad9015de0adb44f519ff010ff0ed51180 (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date:   Mon Oct 5 18:20:23 2020 +0200
+
+    Make ppx_fields_conv compatible with ppxlib.0.18.0
+    
+    ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+    in string constants representation. This PR makes ppx_fields_conv
+    compatible with the latest ppxlib.
+    
+    You might want for the actual release of ppxlib.0.18.0 before merging
+    this!
+    
+    Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/ppx_fields_conv.opam b/ppx_fields_conv.opam
+index 91a9692..3e2d24a 100644
+--- a/ppx_fields_conv.opam
++++ b/ppx_fields_conv.opam
+@@ -15,7 +15,7 @@ depends: [
+   "base"      {>= "v0.14" & < "v0.15"}
+   "fieldslib" {>= "v0.14" & < "v0.15"}
+   "dune"      {>= "2.0.0"}
+-  "ppxlib"    {>= "0.14.0"}
++  "ppxlib"    {>= "0.18.0"}
+ ]
+ synopsis: "Generation of accessor and iteration functions for ocaml records"
+ description: "
+diff --git a/src/ppx_fields_conv.ml b/src/ppx_fields_conv.ml
+index 130e82b..87752cb 100644
+--- a/src/ppx_fields_conv.ml
++++ b/src/ppx_fields_conv.ml
+@@ -34,9 +34,6 @@ let check_no_collision =
+ 
+ module A = struct (* Additional AST construction helpers *)
+ 
+-  let exp_string : (loc:Location.t -> string -> expression) = fun ~loc s ->
+-    pexp_constant ~loc (Pconst_string (s,None))
+-
+   let pat_name : (loc:Location.t -> string -> pattern) = fun ~loc name ->
+     ppat_var ~loc (Loc.make name ~loc)
+ 
+@@ -440,7 +437,7 @@ module Gen_struct = struct
+           [%expr
+               Fieldslib.Field.Field { Fieldslib.Field.For_generated_code.
+                 force_variance = (fun (_ : [%t perm]) -> ());
+-                name = [%e A.exp_string ~loc name];
++                name = [%e estring ~loc name];
+                 getter = [%e A.exp_name ~loc name];
+                 setter = [%e setter_field];
+                 fset = [%e fset];}]
+@@ -725,7 +722,7 @@ module Gen_struct = struct
+     let getter_and_setters, fields = gen_fields ~private_ ~loc labdecs in
+     let create = creation_fun ~loc record_name labdecs in
+     let simple_create = simple_creation_fun ~loc record_name labdecs in
+-    let names = List.map (Inspect.field_names labdecs) ~f:(A.exp_string ~loc) in
++    let names = List.map (Inspect.field_names labdecs) ~f:(estring ~loc) in
+     let fields_module =
+       if String.equal record_name "t" then "Fields" else "Fields_of_" ^ record_name
+     in
diff --git a/dev-ml/ppx_fields_conv/metadata.xml b/dev-ml/ppx_fields_conv/metadata.xml
index 69d1f03f1b85..06458282b1c0 100644
--- a/dev-ml/ppx_fields_conv/metadata.xml
+++ b/dev-ml/ppx_fields_conv/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_fields_conv</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild
new file mode 100644
index 000000000000..efa7ded5042e
--- /dev/null
+++ b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.14.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Generation of accessor and iteration functions for ocaml records"
+HOMEPAGE="https://github.com/janestreet/ppx_fields_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/fieldslib:=
+	>=dev-ml/ppxlib-0.18.0:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_fixed_literal/Manifest b/dev-ml/ppx_fixed_literal/Manifest
new file mode 100644
index 000000000000..c228adbc79c9
--- /dev/null
+++ b/dev-ml/ppx_fixed_literal/Manifest
@@ -0,0 +1 @@
+DIST ppx_fixed_literal-0.14.0.tar.gz 3643 BLAKE2B 7b84dda448f179e778356c3fd5cfdd1dbcb479e03d4e6a9bbd6d2b47c748d0795c18605a86e13e5680bcf23f383d99513408a441fc1fba188d66dad0bd58e875 SHA512 5e30c5238c20a4b6f164ebe29b5f6d4bc074f03fb62aac30a1d129c4fb466124bb163c45e6cc95ad34385ee2e621cf3a1366d3bd9b224438fc575f862f6f73c2
diff --git a/dev-ml/ppx_fixed_literal/metadata.xml b/dev-ml/ppx_fixed_literal/metadata.xml
new file mode 100644
index 000000000000..257ae7bfeade
--- /dev/null
+++ b/dev-ml/ppx_fixed_literal/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/ppx_fixed_literal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild
new file mode 100644
index 000000000000..07e00094a1b7
--- /dev/null
+++ b/dev-ml/ppx_fixed_literal/ppx_fixed_literal-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Simpler notation for fixed point literals"
+HOMEPAGE="https://github.com/janestreet/ppx_fixed_literal"
+SRC_URI="https://github.com/janestreet/ppx_fixed_literal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_hash/Manifest b/dev-ml/ppx_hash/Manifest
index cb31fc191d89..4b6a5885e6e9 100644
--- a/dev-ml/ppx_hash/Manifest
+++ b/dev-ml/ppx_hash/Manifest
@@ -1 +1,2 @@
+DIST ppx_hash-0.14.0.tar.gz 27859 BLAKE2B 0d89eeec154e62ae42ddaff6b0ccdf827ad768e0f19dcdfd4f8b940f594856c8fc036fa02a2462666f2ee4b675e1594837d196fb92cdbb9f8bdf4e171ce90374 SHA512 21d68c0655c21fcd0cecceb8c69e45706b57db160e49c3b112e67cc874a8084946dbae8709ed99f24e7282182c7238cf95ef00bec3ac5a271409e9d5f788467c
 DIST ppx_hash-0.9.0.tar.gz 26942 BLAKE2B 589b9fe1ced89c0dbbc9d3472e21c278a9d1d29c1ceaa3a19ae853727cb4fc446e67deb8b63274ccfbd95fbfa49a5e8cba764bf2a3ae26bb994c9fb16f2b9f32 SHA512 401a87f5cc357ad50fc23f2450b84d6113cd79c1d2506f6e95476795fde0f3240ca252fc3bfe083f9ee1d0511ea3909481387ecf597edef6f90f9756a5a97096
diff --git a/dev-ml/ppx_hash/metadata.xml b/dev-ml/ppx_hash/metadata.xml
index 5a09c9e93857..45d95eaf5e0f 100644
--- a/dev-ml/ppx_hash/metadata.xml
+++ b/dev-ml/ppx_hash/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_hash</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild b/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild
new file mode 100644
index 000000000000..d4e20915192c
--- /dev/null
+++ b/dev-ml/ppx_hash/ppx_hash-0.14.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="PPX rewriter that generates hash functions from type expressions and definitions"
+HOMEPAGE="https://github.com/janestreet/ppx_hash"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	>=dev-ml/ppx_compare-0.10.0:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ocaml-migrate-parsetree:=
+		dev-ml/result:=
+	dev-ml/ppxlib:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_here/Manifest b/dev-ml/ppx_here/Manifest
index 33678cef1df2..b7dd9e94e82d 100644
--- a/dev-ml/ppx_here/Manifest
+++ b/dev-ml/ppx_here/Manifest
@@ -1 +1,2 @@
+DIST ppx_here-0.14.0.tar.gz 5005 BLAKE2B 1711ec047c85af76d2343895e54889fec6e9aa29d4d188e83ff9d9ee12cecf42e4ca968a97f341a818f87efc0cc6ccb7e26f025e8af2195c341cb57325aec62b SHA512 3386e9c727f93be86de1daee2e94c9b7a22bcb4bd0ef20bd2c40ac227723ac36c9ac04fd3e16121731227a9b5256898594e0f33860864edf6f15797b98b114da
 DIST ppx_here-0.9.1.tar.gz 7225 BLAKE2B 7115c77477b2bab47febfafe55d422bef03c32502d9d0064c5633d6925faf1b3a8b580f2a0974edcf86613f9b2582b0067f3e08a4ca474333f7e15c2c7adb87d SHA512 ca21fb490a4d980616349850b781e4ee02c0eb8a27e8ef9d4092d15ee235ffc504dab1b2a3db44fc6a84fa6b2cdbd67c0c4adbc41fb094b7bb9d4f710193aaf2
diff --git a/dev-ml/ppx_here/metadata.xml b/dev-ml/ppx_here/metadata.xml
index 73cffad57b88..24b631f152ae 100644
--- a/dev-ml/ppx_here/metadata.xml
+++ b/dev-ml/ppx_here/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_here</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_here/ppx_here-0.14.0.ebuild b/dev-ml/ppx_here/ppx_here-0.14.0.ebuild
new file mode 100644
index 000000000000..03f95e8f529d
--- /dev/null
+++ b/dev-ml/ppx_here/ppx_here-0.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Expands [%here] into its location"
+HOMEPAGE="https://github.com/janestreet/ppx_here"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-compiler-libs:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
+
+# Error: No rule found for test/dummy.ml.pp
+RESTRICT=test
diff --git a/dev-ml/ppx_inline_test/Manifest b/dev-ml/ppx_inline_test/Manifest
index fc73d0c13867..8342b11fde40 100644
--- a/dev-ml/ppx_inline_test/Manifest
+++ b/dev-ml/ppx_inline_test/Manifest
@@ -1 +1,2 @@
+DIST ppx_inline_test-0.14.1.tar.gz 19683 BLAKE2B f40e462d8eca18734883fd0b8777a9c69c0cc2741df8e95ade64685ea0b8d51dc614db6a4e93016fec0e2b521ea803a52b85d4b6e030239f6736f4f89da5a721 SHA512 24bda655ae8e1110d9550730281ab908a1795b1412545717a06e01143a80f92ba0a9d42cb20c4c9283f0725003a5c41c187bd46732ef2dd724a4714d9d41814e
 DIST ppx_inline_test-0.9.2.tar.gz 19280 BLAKE2B 3cd354f27c69bc4fdd29b6a8b0637a08f247774127512886341ec04b8957bd2a66ed6bbfad95d1a529e4c670c815bdbfbfb80ecb9c6e02949a8d34d938d515c3 SHA512 39261a51201b2b7fbd6f4f53c72b2921da9f5a47f726479f65f976ed3979630f0a8587328f4536e42d24315d341afbe2770084ffd951569564a3145cd154be5f
diff --git a/dev-ml/ppx_inline_test/metadata.xml b/dev-ml/ppx_inline_test/metadata.xml
index d700cdb85213..b8d06ea426a3 100644
--- a/dev-ml/ppx_inline_test/metadata.xml
+++ b/dev-ml/ppx_inline_test/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_inline_test</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild
new file mode 100644
index 000000000000..f3f3529dd3e3
--- /dev/null
+++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.14.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Syntax extension for writing in-line tests in ocaml code"
+HOMEPAGE="https://github.com/janestreet/ppx_inline_test"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ocaml-migrate-parsetree:=
+		dev-ml/result:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-compiler-libs:=
+	dev-ml/time_now:=
+"
+RDEPEND="${DEPEND}"
+RESTRICT="test"
diff --git a/dev-ml/ppx_jane/Manifest b/dev-ml/ppx_jane/Manifest
index a91554b21179..2bd30d9e9f25 100644
--- a/dev-ml/ppx_jane/Manifest
+++ b/dev-ml/ppx_jane/Manifest
@@ -1 +1,2 @@
+DIST ppx_jane-0.14.0.tar.gz 4593 BLAKE2B 787fc0701ba0361446cb210c23469881da8fbab28460262a7bdca8723af158ed8deeb4597a31c8d89a4d44e5263c74e0ebc504b83827e0a34870a503b2ea9053 SHA512 b51bef2330ebb8d361b3f856a0526a5290664b68fa56a02de7020b0e27aaf5a378f1b22fc9a24007bfc812af67eb79343b2bdc3ca550108393323b99e29c623d
 DIST ppx_jane-0.9.0.tar.gz 5831 BLAKE2B 0eda7b2a71c7e80d7febea6f204aaf7ccebff321f14a423bfe289fd3144251aeba0c3a15db360cd0732196900cdf3eeb5860db14fd001215bdc29e6471c94c52 SHA512 18b09c060519b94013c78ef4673ec7c26f465453391c6ad2ea3235b6f8e23208879c5d4e69dc01915cfb694b23171397af5e4b7208556a369d191c081c86fc2a
diff --git a/dev-ml/ppx_jane/metadata.xml b/dev-ml/ppx_jane/metadata.xml
index 4f7c369b5773..1ad033b289c7 100644
--- a/dev-ml/ppx_jane/metadata.xml
+++ b/dev-ml/ppx_jane/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_jane</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild
new file mode 100644
index 000000000000..d355e0a30193
--- /dev/null
+++ b/dev-ml/ppx_jane/ppx_jane-0.14.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Standard Jane Street ppx rewriters"
+HOMEPAGE="https://github.com/janestreet/ppx_jane"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base_quickcheck:=
+	dev-ml/ppx_assert:=
+	dev-ml/ppx_base:=
+	dev-ml/ppx_bench:=
+	dev-ml/ppx_bin_prot:=
+	dev-ml/ppx_custom_printf:=
+	dev-ml/ppx_expect:=
+	dev-ml/ppx_fail:=
+	dev-ml/ppx_fields_conv:=
+	dev-ml/ppx_fixed_literal:=
+	dev-ml/ppx_here:=
+	dev-ml/ppx_inline_test:=
+	dev-ml/ppx_let:=
+	dev-ml/ppx_module_timer:=
+	dev-ml/ppx_optcomp:=
+	dev-ml/ppx_optional:=
+	dev-ml/ppx_pipebang:=
+	dev-ml/ppx_sexp_message:=
+	dev-ml/ppx_sexp_value:=
+	dev-ml/ppx_stable:=
+	dev-ml/ppx_string:=
+	dev-ml/ppx_typerep_conv:=
+	dev-ml/ppx_variants_conv:=
+	dev-ml/ppxlib:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_js_style/Manifest b/dev-ml/ppx_js_style/Manifest
index e5e008e6d5cf..064c16e7f3ab 100644
--- a/dev-ml/ppx_js_style/Manifest
+++ b/dev-ml/ppx_js_style/Manifest
@@ -1 +1,2 @@
+DIST ppx_js_style-0.14.0.tar.gz 10587 BLAKE2B 8219a69526be53b9fce488f725c79ff30c451c556853aa54d8dbbd7040a76df37ac8942ae05cdcbbe6d839a64d5b471f53a2fce276e547a17e68490c1ec1ab19 SHA512 3561b7668bafc421fa82c3c80e019185924bfc8cafab6ef81299395061db78261005bdd34be5bed8a80bec84306b9294e6398a3a1ee0a269f7b8f3942953a6a4
 DIST ppx_js_style-0.9.0.tar.gz 8182 BLAKE2B e2c4bffb07882d49f3839b2a402e2617b9e19147a0d4ff4c7aa4fb4a350d2208eccd76ec64828c4d56edce8f811c462396aa805ca3440b93ba22790d59c8dd23 SHA512 9790223a2d8f6db090cfa4d7ff3d3d1c8a22b07863dd3c5674216836b23cfdb3b014ebc092e173ddfe725ccf73fc7830a8a88effab1df9d80875f918b9558051
diff --git a/dev-ml/ppx_js_style/metadata.xml b/dev-ml/ppx_js_style/metadata.xml
index 3272a51e2cff..0d5d7a713ab7 100644
--- a/dev-ml/ppx_js_style/metadata.xml
+++ b/dev-ml/ppx_js_style/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_js_style</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild
new file mode 100644
index 000000000000..01b6094d5562
--- /dev/null
+++ b/dev-ml/ppx_js_style/ppx_js_style-0.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Code style checker for Jane Street Packages"
+HOMEPAGE="https://github.com/janestreet/ppx_js_style"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/octavius:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+	"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_let/Manifest b/dev-ml/ppx_let/Manifest
index b18963fb4dc3..d7ecf3f17af3 100644
--- a/dev-ml/ppx_let/Manifest
+++ b/dev-ml/ppx_let/Manifest
@@ -1 +1,2 @@
+DIST ppx_let-0.14.0.tar.gz 10822 BLAKE2B c1dc155afb0bc52bb22d65c2c19536d41d53e4cf10d39b70ebadf1cf8cfb37ff1c25d9fcfb48f9421a0c55887acc2c6ce72d531593a61654146d3196fa83499d SHA512 79f2dcf2c76308b5993d1b9dad5c961b816dcc4ae43d856c51c196a67eb21b2f51135762e52d512afa9b45aca30002abbca76036ebcc117464a4823d1c40ed0c
 DIST ppx_let-0.9.0.tar.gz 9245 BLAKE2B 827efa86db6981416c07205bf520d750dea6b6a2f1789faaeb59fcc7ddff78470e9670c471c5c3e5b6929181149404b86e3bbe6e67ffa2946895a7d464079316 SHA512 545cdf341dafaab958e1dfec476f3a714ae5899dea3775ace443e36fe4d55136489ae376f2394dbecdcbcb4dbc66e41a1de147b2774c9a0c7508b827acba4250
diff --git a/dev-ml/ppx_let/metadata.xml b/dev-ml/ppx_let/metadata.xml
index 0fcc4e6ccaeb..94e867485031 100644
--- a/dev-ml/ppx_let/metadata.xml
+++ b/dev-ml/ppx_let/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_let</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_let/ppx_let-0.14.0.ebuild b/dev-ml/ppx_let/ppx_let-0.14.0.ebuild
new file mode 100644
index 000000000000..10a7743ff23a
--- /dev/null
+++ b/dev-ml/ppx_let/ppx_let-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Monadic let-bindings"
+HOMEPAGE="https://github.com/janestreet/ppx_let"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_metaquot/Manifest b/dev-ml/ppx_metaquot/Manifest
index 7ec64ce0eca4..19d8b13ffd84 100644
--- a/dev-ml/ppx_metaquot/Manifest
+++ b/dev-ml/ppx_metaquot/Manifest
@@ -1 +1,2 @@
+DIST ppx_metaquot-0.11.0.tar.gz 5407 BLAKE2B 610f3197e2809914232310363775bb5f0f889681fec1274071eba71617131b863f6229e85dcdf3749dbb300a980f39dfeacfe23f388f5f898d01925d07fbcc43 SHA512 59d95a5d9298d47adc9e3ca531aae59c91cfa019d90a5d8aa5e11de6bf1f3d3fcd2dbc800028a3ab999ba51257f695116b0a32a96c958bafea39761fe5db230b
 DIST ppx_metaquot-0.9.0.tar.gz 6801 BLAKE2B b5629da4c2460ed064e614e0051bd104fd731526498ffd085a75039672c186f314918c4c355a9dacfee7982c06b338950de0a670b27bd061e19b688a21693c08 SHA512 7645f02f964f2a33836f947a725384f95c7724dcd88c031aa3dd2d255127a21d473e19ff77cb917f845930ab44541a4698becf56721cc1a0a0eee5912947cd22
diff --git a/dev-ml/ppx_metaquot/metadata.xml b/dev-ml/ppx_metaquot/metadata.xml
index cc4e02414d74..dac500f6bc30 100644
--- a/dev-ml/ppx_metaquot/metadata.xml
+++ b/dev-ml/ppx_metaquot/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_metaquot</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_metaquot/ppx_metaquot-0.11.0.ebuild b/dev-ml/ppx_metaquot/ppx_metaquot-0.11.0.ebuild
new file mode 100644
index 000000000000..f96e27fefda5
--- /dev/null
+++ b/dev-ml/ppx_metaquot/ppx_metaquot-0.11.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Write OCaml AST fragment using OCaml syntax"
+HOMEPAGE="https://github.com/janestreet/ppx_metaquot"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/ppxlib:="
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_module_timer/Manifest b/dev-ml/ppx_module_timer/Manifest
new file mode 100644
index 000000000000..e07961242984
--- /dev/null
+++ b/dev-ml/ppx_module_timer/Manifest
@@ -0,0 +1 @@
+DIST ppx_module_timer-0.14.0.tar.gz 7262 BLAKE2B 6fafc6b4b449071f4a95619d078814b0c3ace3574df46585b72549e5db349ab476124c217f46c6903c7c8a059f779dc62cc8a079eb1ef6b4854646fdabdf04bf SHA512 cd9b6bbd6461b7408a31a0f6ca010a3c755db1f4a22150645c530e7b4a0a4c76a308ad0f8aeddc54914a116f6d74bd738604cfd9d9d255197f9ea18904d715e7
diff --git a/dev-ml/ppx_module_timer/metadata.xml b/dev-ml/ppx_module_timer/metadata.xml
new file mode 100644
index 000000000000..b993e4623ddc
--- /dev/null
+++ b/dev-ml/ppx_module_timer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/ppx_module_timer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild b/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild
new file mode 100644
index 000000000000..5becf5b05ffd
--- /dev/null
+++ b/dev-ml/ppx_module_timer/ppx_module_timer-0.14.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Ppx rewriter that records top-level module startup times"
+HOMEPAGE="https://github.com/janestreet/ppx_module_timer"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_base:=
+	dev-ml/stdio:=
+	dev-ml/time_now:=
+	dev-ml/ppxlib:=
+		dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
index 97571ab30d40..a27b0ede003c 100644
--- a/dev-ml/ppx_optcomp/Manifest
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -1 +1,2 @@
+DIST ppx_optcomp-0.14.0.tar.gz 16583 BLAKE2B 9b139708e02501245d5440a862324fe0191c9c96772e6599ed474a734263c4d2c0fa08fff666abd2efb218ec03a2b9b47c5ef6480d53a8d0f280550b741ac39a SHA512 e86b108d805500cbd7be628f41436ec8de0e8622d4218631d01bf73b0e70da0a057b8531465206baa9b8851ce9c22c5cd53921fccfae352ee46527d69964dc44
 DIST ppx_optcomp-0.9.0.tar.gz 14611 BLAKE2B 6fc431fd3ed173835a48814718a05b3ae619f182f4c008415dba77c88bfeab780e6fc49c4faed2ee4e362b6a151544b1a707651dcbfdbfcdce979a2a3d6d6c02 SHA512 ce4a5049045458533b783b99b7569e72e074bd425a81315d43fcab26dbc2a4b141cfda2b2365c69b3d0251f2bf0b8c8f0d14fc8883f1a0f4edae824776565a9c
diff --git a/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..063b9df74aba
--- /dev/null
+++ b/dev-ml/ppx_optcomp/files/ppx_optcomp-0.14.0-ppxlib-0.18.0.patch
@@ -0,0 +1,63 @@
+commit a4422ecd7e0677569533b1dae07924f5d786e8f6 (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date:   Mon Oct 5 18:35:26 2020 +0200
+
+    Make ppx_optcomp compatible with ppxlib.0.18.0
+    
+    ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+    in string constants representation. This PR makes ppx_optcomp
+    compatible with the latest ppxlib.
+    
+    You might want for the actual release of ppxlib.0.18.0 before merging
+    this!
+    
+    Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/ppx_optcomp.opam b/ppx_optcomp.opam
+index 20eb7c5..cbe8b5c 100644
+--- a/ppx_optcomp.opam
++++ b/ppx_optcomp.opam
+@@ -15,7 +15,7 @@ depends: [
+   "base"   {>= "v0.14" & < "v0.15"}
+   "stdio"  {>= "v0.14" & < "v0.15"}
+   "dune"   {>= "2.0.0"}
+-  "ppxlib" {>= "0.11.0"}
++  "ppxlib" {>= "0.18.0"}
+ ]
+ synopsis: "Optional compilation for OCaml"
+ description: "
+diff --git a/src/interpreter.ml b/src/interpreter.ml
+index f1da14b..1c6d726 100644
+--- a/src/interpreter.ml
++++ b/src/interpreter.ml
+@@ -241,7 +241,7 @@ let rec eval env e : Value.t =
+   match e.pexp_desc with
+   | Pexp_constant (Pconst_integer    (x, None)) -> Int (parse_int loc x)
+   | Pexp_constant (Pconst_char    x       ) -> Char x
+-  | Pexp_constant (Pconst_string (x, _   )) -> String x
++  | Pexp_constant (Pconst_string (x, _, _   )) -> String x
+ 
+   | Pexp_construct ({ txt = Lident "true" ; _ }, None) -> Bool true
+   | Pexp_construct ({ txt = Lident "false"; _ }, None) -> Bool false
+@@ -361,7 +361,7 @@ and bind env patt value =
+ 
+   | Ppat_constant (Pconst_integer    (x, None)), Int    y when parse_int loc x = y -> env
+   | Ppat_constant (Pconst_char    x       ), Char   y when Char.equal   x y -> env
+-  | Ppat_constant (Pconst_string (x, _   )), String y when String.equal x y -> env
++  | Ppat_constant (Pconst_string (x, _, _   )), String y when String.equal x y -> env
+ 
+   | Ppat_construct ({ txt = Lident "true" ; _ }, None), Bool true  -> env
+   | Ppat_construct ({ txt = Lident "false"; _ }, None), Bool false -> env
+diff --git a/src/ppx_optcomp.ml b/src/ppx_optcomp.ml
+index a2573de..d87ea24 100644
+--- a/src/ppx_optcomp.ml
++++ b/src/ppx_optcomp.ml
+@@ -81,7 +81,7 @@ module Ast_utils = struct
+   let get_string ~loc payload =
+     let e = get_expr ~loc payload in
+     match e with
+-    | { pexp_desc = Pexp_constant (Pconst_string (x, _ )); _ } -> x
++    | { pexp_desc = Pexp_constant (Pconst_string (x, _, _ )); _ } -> x
+     | _ -> Location.raise_errorf ~loc "optcomp: invalid directive syntax, expected string"
+ 
+ end
diff --git a/dev-ml/ppx_optcomp/metadata.xml b/dev-ml/ppx_optcomp/metadata.xml
index f45619ffca46..30b65cf1fd3a 100644
--- a/dev-ml/ppx_optcomp/metadata.xml
+++ b/dev-ml/ppx_optcomp/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_optcomp</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild
new file mode 100644
index 000000000000..f1290a509500
--- /dev/null
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.14.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Optional compilation for OCaml"
+HOMEPAGE="https://github.com/janestreet/ppx_optcomp"
+SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/stdio:=
+	>=dev-ml/ppxlib-0.18.0:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_optional/Manifest b/dev-ml/ppx_optional/Manifest
index ce42d2ddd1cb..7782ba09d705 100644
--- a/dev-ml/ppx_optional/Manifest
+++ b/dev-ml/ppx_optional/Manifest
@@ -1 +1,2 @@
+DIST ppx_optional-0.14.0.tar.gz 6090 BLAKE2B 99c5ed7ab6b6c555477eaf468786cc175ff8c8ac4d0c6abb8110637da57396ed599d5c10bd35f3d5ff27a41b00314ca355596e4158c4d792fcb37d547455b90d SHA512 70ed28a974ea1bbcb3fe2e54911e355da54fafd6dff3e74c471126a824c28e9a180777e96e17c4a7a52be4be507fbbc0fa3e92310346dbaf5ab8711845e92e40
 DIST ppx_optional-0.9.0.tar.gz 6940 BLAKE2B 28b9ab2b8cc20f295e927533ff9eed694289987914105758d3c014d06064bd21016d44bc7ad72b331a4c887848ed9c2dd75a0a48b6d5f330de898087596d1cc3 SHA512 c341bc8e64b7caf7af5c878747697330db84b14959f22930dd6919cc861dce847983771cbad2ed7800ab8c64704e88fa0d8db3ca7c8f2924bf785a4dccd17fa0
diff --git a/dev-ml/ppx_optional/metadata.xml b/dev-ml/ppx_optional/metadata.xml
index aa510eb3b023..8a58c771030e 100644
--- a/dev-ml/ppx_optional/metadata.xml
+++ b/dev-ml/ppx_optional/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_optional</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild b/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild
new file mode 100644
index 000000000000..49577612a831
--- /dev/null
+++ b/dev-ml/ppx_optional/ppx_optional-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Pattern matching on flat options"
+HOMEPAGE="https://github.com/janestreet/ppx_optional"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+		dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_pipebang/Manifest b/dev-ml/ppx_pipebang/Manifest
index b1978f4cad5f..a73b6b232a80 100644
--- a/dev-ml/ppx_pipebang/Manifest
+++ b/dev-ml/ppx_pipebang/Manifest
@@ -1 +1,2 @@
+DIST ppx_pipebang-0.14.0.tar.gz 3766 BLAKE2B a2e99dd5e27ddbca5d77b1c215757d8d0d2d54b53511f0db93a09a16c25b5c5e429a08c8d42c7e4843eeb23c346649dea5700c445afe176f4b1625340901b6c1 SHA512 b07004aef0865c877f8f814068b514298568078785586933f400350d1a1dae3eb4aafe1ba4f12e17a3e2a3945297162c4a725ebfbc153e80b412c6086019959a
 DIST ppx_pipebang-0.9.0.tar.gz 5964 BLAKE2B ce001d207a59b1e99f7a023c2823d1b90233762147ad377aa54f7c771041e77081f7f9b05a0f36cb9a2f6379622a9686fa5bad8974d7707dc0b22b3c704edac6 SHA512 d0e82152d257f7214e577e37046877a9c4129c6a9fd79f83912c6335455add4302d927e70117a1e9386c448686d271a7596b3fd2ef0b5f2bda8010cbb9157751
diff --git a/dev-ml/ppx_pipebang/metadata.xml b/dev-ml/ppx_pipebang/metadata.xml
index b7e3332536f9..91b6ab049cba 100644
--- a/dev-ml/ppx_pipebang/metadata.xml
+++ b/dev-ml/ppx_pipebang/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_pipebang</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild b/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild
new file mode 100644
index 000000000000..669bd4848cb1
--- /dev/null
+++ b/dev-ml/ppx_pipebang/ppx_pipebang-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A ppx rewriter that inlines reverse application operators |> and |!"
+HOMEPAGE="https://github.com/janestreet/ppx_pipebang"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+	dev-ml/base:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_sexp_conv/Manifest b/dev-ml/ppx_sexp_conv/Manifest
index c2d417ec8f51..3c751982c3d5 100644
--- a/dev-ml/ppx_sexp_conv/Manifest
+++ b/dev-ml/ppx_sexp_conv/Manifest
@@ -1 +1,2 @@
+DIST ppx_sexp_conv-0.14.1.tar.gz 49857 BLAKE2B ede55963d995917bd0c4a1464b58f8584ec6be4793df706fd3be96670fe685aba82459f9a1e4c6117c594953a3f23c502cc609f1069d482d24278baf7ed87ed5 SHA512 5018abe07300f67cb2c8b8cd8242403a91ac6b7fda13fe43060b3b09635082a7ad45858c7c6442a5fcae2b6d7d398a03eec16cfcbc5fd59f7f3f5c5fd1ad56f9
 DIST ppx_sexp_conv-0.9.0.tar.gz 28000 BLAKE2B 2536d3ddbd4ee83baf9eade208983ce9856318079e29da9858838c985b904a7e2e1c6e3ea06bd1360cc17e619f1e952634554e89b294dd00981934679b384c3f SHA512 af3d28a3cdb7c796549a2598c218f69a69d58da715ef2d16077c3adeb22823fa7bec6bc0d8cb6caaf2a0adb56dfcb39d667975959251fb310b69d6abe8302845
diff --git a/dev-ml/ppx_sexp_conv/files/ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch b/dev-ml/ppx_sexp_conv/files/ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..48004a4f26e2
--- /dev/null
+++ b/dev-ml/ppx_sexp_conv/files/ppx_sexp_conv-0.14.1-ppxlib-0.18.0.patch
@@ -0,0 +1,41 @@
+commit 13e9b27f5f9550b825128f8cd1f31d20dc8fa91b (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date:   Mon Oct 5 17:33:56 2020 +0200
+
+    Make ppx_sexp_conv compatible with ppxlib.0.18.0
+    
+    ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+    in string constants representation. This PR makes ppx_sexp_conv
+    compatible with the latest ppxlib.
+    
+    You might want for the actual release of ppxlib.0.18.0 before merging
+    this!
+    
+    Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/expander/sexp_grammar_lifter.ml b/expander/sexp_grammar_lifter.ml
+index 05005bf..17f1e73 100644
+--- a/expander/sexp_grammar_lifter.ml
++++ b/expander/sexp_grammar_lifter.ml
+@@ -28,7 +28,7 @@ type atom      = Atom.t
+ type var_name  = Sexp.Private.Raw_grammar.var_name
+ type type_name = Sexp.Private.Raw_grammar.type_name
+ 
+-let lift_string ~loc s = pexp_constant ~loc (Pconst_string (s, None))
++let lift_string ~loc s = pexp_constant ~loc (Pconst_string (s, loc, None))
+ let lift_var_name      = lift_string
+ let lift_type_name     = lift_string
+ 
+diff --git a/ppx_sexp_conv.opam b/ppx_sexp_conv.opam
+index 06fd03e..05c4182 100644
+--- a/ppx_sexp_conv.opam
++++ b/ppx_sexp_conv.opam
+@@ -15,7 +15,7 @@ depends: [
+   "base"     {>= "v0.14" & < "v0.15"}
+   "sexplib0" {>= "v0.14" & < "v0.15"}
+   "dune"     {>= "2.0.0"}
+-  "ppxlib"   {>= "0.11.0"}
++  "ppxlib"   {>= "0.18.0"}
+ ]
+ synopsis: "[@@deriving] plugin to generate S-expression conversion functions"
+ description: "
diff --git a/dev-ml/ppx_sexp_conv/metadata.xml b/dev-ml/ppx_sexp_conv/metadata.xml
index 0ff7a80359e7..49e0dac594b0 100644
--- a/dev-ml/ppx_sexp_conv/metadata.xml
+++ b/dev-ml/ppx_sexp_conv/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_sexp_conv</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
new file mode 100644
index 000000000000..a8e0f48c7c3c
--- /dev/null
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.14.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Support Library for type-driven code generators"
+HOMEPAGE="https://github.com/janestreet/ppx_sexp_conv"
+SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ocaml-migrate-parsetree:=
+		dev-ml/result:=
+	>=dev-ml/ppxlib-0.18.0:=
+		dev-ml/ocaml-compiler-libs:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_sexp_message/Manifest b/dev-ml/ppx_sexp_message/Manifest
index d04f619ba6bc..5b3b55f00d24 100644
--- a/dev-ml/ppx_sexp_message/Manifest
+++ b/dev-ml/ppx_sexp_message/Manifest
@@ -1 +1,2 @@
+DIST ppx_sexp_message-0.14.0.tar.gz 7738 BLAKE2B a00577faf55b0816991bfe6f11fdc21d9b56893c29e67036483adce56c095cb8a2ee9014f9f0768ab96bbd28fe2f46b262e8a6122cf66ccb2740af7be890db0d SHA512 627f8e52914ef228277ff31a0d2262de823767fa0b510b1a29cbfc754c7cbc84cabe7c94de3e3a72d888d19e23584ebcc46c16997ffd7cdae41378cb44b2bc23
 DIST ppx_sexp_message-0.9.0.tar.gz 8965 BLAKE2B df59ff7f598a7ff19a16829addbc5b49f2e7dfb2b30aab43f5d220f6d45f625750ca1d63eba3187b09d494a2c06af642c2a2e4d581c6a247440ba06d6f46dae0 SHA512 38a376b23372b8699fef76085ad2ead7b5fb34b823b0c7e3e52ac90654133a44429d7a3383197b78c8f01a7b64753ce424d5138b8aef596d236ce9c798ec1887
diff --git a/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch
new file mode 100644
index 000000000000..a472c5ab29a1
--- /dev/null
+++ b/dev-ml/ppx_sexp_message/files/ppx_sexp_message-0.14.0-ppxlib-0.18.0.patch
@@ -0,0 +1,41 @@
+commit fd604b269398aebdb0c5fa5511d9f3c38b6ecb45 (HEAD, origin/upgrade-ppxlib-0.18.0)
+Author: Nathan Rebours <nathan.p.rebours@gmail.com>
+Date:   Mon Oct 5 18:04:41 2020 +0200
+
+    Make ppx_sexp_message compatible with ppxlib.0.18.0
+    
+    ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
+    in string constants representation. This PR makes ppx_sexp_message
+    compatible with the latest ppxlib.
+    
+    You might want for the actual release of ppxlib.0.18.0 before merging
+    this!
+    
+    Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
+
+diff --git a/expander/ppx_sexp_message_expander.ml b/expander/ppx_sexp_message_expander.ml
+index e0c2477..c801cd7 100644
+--- a/expander/ppx_sexp_message_expander.ml
++++ b/expander/ppx_sexp_message_expander.ml
+@@ -97,7 +97,7 @@ let sexp_of_expr ~omit_nil e =
+   let e = rewrite_here e in
+   let loc = { e.pexp_loc with loc_ghost = true } in
+   match e.pexp_desc with
+-  | Pexp_constant (Pconst_string ("", _)) -> Absent
++  | Pexp_constant (Pconst_string ("", _, _)) -> Absent
+   | Pexp_constant const ->
+     present_or_omit_nil ~loc ~omit_nil:false (sexp_of_constant ~loc const)
+   | Pexp_constraint (expr, ctyp) -> sexp_of_constraint ~omit_nil ~loc expr ctyp
+diff --git a/ppx_sexp_message.opam b/ppx_sexp_message.opam
+index d8a6d95..3d6ef41 100644
+--- a/ppx_sexp_message.opam
++++ b/ppx_sexp_message.opam
+@@ -16,7 +16,7 @@ depends: [
+   "ppx_here"      {>= "v0.14" & < "v0.15"}
+   "ppx_sexp_conv" {>= "v0.14" & < "v0.15"}
+   "dune"          {>= "2.0.0"}
+-  "ppxlib"        {>= "0.11.0"}
++  "ppxlib"        {>= "0.18.0"}
+ ]
+ synopsis: "A ppx rewriter for easy construction of s-expressions"
+ description: "
diff --git a/dev-ml/ppx_sexp_message/metadata.xml b/dev-ml/ppx_sexp_message/metadata.xml
index 715559feb2c9..2f418c1a3acf 100644
--- a/dev-ml/ppx_sexp_message/metadata.xml
+++ b/dev-ml/ppx_sexp_message/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_sexp_message</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
new file mode 100644
index 000000000000..35cfea25682a
--- /dev/null
+++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.14.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="A ppx rewriter for easy construction of s-expressions"
+HOMEPAGE="https://github.com/janestreet/ppx_sexp_message"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_here:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ocaml-migrate-parsetree:=
+		dev-ml/result:=
+	>=dev-ml/ppxlib-0.18.0:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ppxlib-0.18.0.patch )
diff --git a/dev-ml/ppx_sexp_value/Manifest b/dev-ml/ppx_sexp_value/Manifest
index eb65e1812075..fa80fbff385e 100644
--- a/dev-ml/ppx_sexp_value/Manifest
+++ b/dev-ml/ppx_sexp_value/Manifest
@@ -1 +1,2 @@
+DIST ppx_sexp_value-0.14.0.tar.gz 7740 BLAKE2B f495d0b9032a73cd6a62292185e77cfe6206bb06564e663c04a20c9430dd4188da529bef6428a7a07309109ec7fc51d3909ac58d5760c1fab618f59eee8a6b63 SHA512 d33ed503025e07588a21ca6796004dd53ddfb9f67f3527d066c4767734fb8723d0a9d31082d285ba82996d8b69faecb624f116046ea8048637f05773ee3e89a8
 DIST ppx_sexp_value-0.9.0.tar.gz 10666 BLAKE2B db3f3bc626b00dd6bf6c1ab1afedfd581ec48689307c1ad52767b0aa64d5c36a10556b37ac3e2e2fecf1eb5230ab1e049f458ff3c8c039cf789146f1458dbf2a SHA512 7dcb8f70a7938d26fc5a1afea2bf5e77c4996d8e82720206ab9e5a462a59182dcedfbfede49ed83ed50f2683776b75fb5bae00c53fc451b03f6a33e126566e84
diff --git a/dev-ml/ppx_sexp_value/metadata.xml b/dev-ml/ppx_sexp_value/metadata.xml
index 77efff66f4ea..8bfb2fda744c 100644
--- a/dev-ml/ppx_sexp_value/metadata.xml
+++ b/dev-ml/ppx_sexp_value/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_sexp_value</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
new file mode 100644
index 000000000000..0b8d92037c61
--- /dev/null
+++ b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.14.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Standard library for ppx rewriters"
+HOMEPAGE="https://github.com/janestreet/ppx_sexp_value"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_here:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ocaml-migrate-parsetree:=
+		dev-ml/result:=
+	dev-ml/ppxlib:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_stable/Manifest b/dev-ml/ppx_stable/Manifest
new file mode 100644
index 000000000000..4c65859c1972
--- /dev/null
+++ b/dev-ml/ppx_stable/Manifest
@@ -0,0 +1 @@
+DIST ppx_stable-0.14.1.tar.gz 12031 BLAKE2B 837a53206d3a8d651d53f665daebbcfde3a1b5d55f1ed13d3ac8feecbd9ba0fb24ad7bb1cf24a0bfa00a41a46c3ef0f84385bc8792685f42ef18facf88ce348f SHA512 1c99a61537a2ce7d40208c64efbf71c54726b228d3746f2afaf9e813b3fed9c8016bb2eb859be24993c7c922a34f574e1028db8e7ee922d4772336dc0496df74
diff --git a/dev-ml/ppx_stable/metadata.xml b/dev-ml/ppx_stable/metadata.xml
new file mode 100644
index 000000000000..b92f10916eeb
--- /dev/null
+++ b/dev-ml/ppx_stable/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/ppx_stable</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild b/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild
new file mode 100644
index 000000000000..d001ad9bbfe7
--- /dev/null
+++ b/dev-ml/ppx_stable/ppx_stable-0.14.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Stable types conversions generator"
+HOMEPAGE="https://github.com/janestreet/ppx_stable"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_string/Manifest b/dev-ml/ppx_string/Manifest
new file mode 100644
index 000000000000..fb237031a530
--- /dev/null
+++ b/dev-ml/ppx_string/Manifest
@@ -0,0 +1 @@
+DIST ppx_string-0.14.1.tar.gz 4807 BLAKE2B 2ce5cf2d5dd913f05e66c24ea5be2ce4a56c59b7e5faecf003a573274bfaef3834935276e110fba1d0af3a3ef9d6ca730622dc780ab6063945a01aa3d6900a43 SHA512 2b570ca3d248f89ee1903e6ea40fbcd9c5c72809ff1f42dc67e9d41f6c297465ae47ffdbeda9f263dddf14c9c460bbbdee01243cef838d0ec49493c3b5644aee
diff --git a/dev-ml/ppx_string/metadata.xml b/dev-ml/ppx_string/metadata.xml
new file mode 100644
index 000000000000..1350c31c1a0c
--- /dev/null
+++ b/dev-ml/ppx_string/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/ppx_string</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppx_string/ppx_string-0.14.1.ebuild b/dev-ml/ppx_string/ppx_string-0.14.1.ebuild
new file mode 100644
index 000000000000..1dba11376c55
--- /dev/null
+++ b/dev-ml/ppx_string/ppx_string-0.14.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Ppx extension for string interpolation"
+HOMEPAGE="https://github.com/janestreet/ppx_string"
+SRC_URI="https://github.com/janestreet/ppx_string/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/stdio:=
+	dev-ml/ppx_base:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index ee595bfd62d6..6db93e619196 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1,3 +1,4 @@
 DIST ppx_tools-5.0.4.03.0.tar.gz 17209 BLAKE2B bd51e5b2482a9eab09bf9a02ac0231fa7bbc721d54a932e6cfdc1d719c106eca0fe90563b636601110e796fab439f6c6d7fccd5d2920f5bcb3c115f622d90381 SHA512 d1867b084885704757f390b6f6ca8b5d7702f0476149d99ea227f98230ab35d57f5c4aa779881231a0a77cfd1861255118fa2551a49ab85553f63e9aab9baae4
 DIST ppx_tools-5.0.4.05.0.tar.gz 17893 BLAKE2B 0902f53ef19338396cf2a2319a4c2d4b7bbbfb66bbfd0fb2290c29ecebcda02ff90d2f0d0221b08d027c41c863c2bc0a02c50363d83474864c08e619641b7ad6 SHA512 33b4420500a2b5880e770f8fdf2b37ef08e52ff84f96f955c6321492de906568979feccb1b2b477b1117619ba28edd8d3e0f178c5684f0dc43c6ed56266c4d64
 DIST ppx_tools-5.3.4.08.0.tar.gz 18590 BLAKE2B fac872d113ab1bf9135357dea47d468924e16a1a038b64152d5ebb27daa69a8c2d906750146157954f4d95769535f4a93c1ecc9582ca0313d601a06606196c00 SHA512 817e2688d60f013fa42ffa263cfcc15cfae820240d2e54dfedf1f4a4191f9b9fc365a190cc7eeb9082ed72fbf3c94d6ba72c38c7db3e2bcac49a17ba590d71b5
+DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B f8af2a1eee81d5a1e73ac606ab79d285c8c226533bcf715ed22386aecfaf51260fb9a5075d270675f1b601cb174b68d8c85556f418031a7b6bda06c4376fe443 SHA512 fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8
diff --git a/dev-ml/ppx_tools/metadata.xml b/dev-ml/ppx_tools/metadata.xml
index e8d73658568c..5631f770f367 100644
--- a/dev-ml/ppx_tools/metadata.xml
+++ b/dev-ml/ppx_tools/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">alainfrisch/ppx_tools</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">alainfrisch/ppx_tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ppx_tools/ppx_tools-6.2.ebuild b/dev-ml/ppx_tools/ppx_tools-6.2.ebuild
new file mode 100644
index 000000000000..3530629b0eaa
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-6.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV=$(ver_rs 2 '+')
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
+SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
diff --git a/dev-ml/ppx_typerep_conv/Manifest b/dev-ml/ppx_typerep_conv/Manifest
index 464a1925c454..d1b1e183b575 100644
--- a/dev-ml/ppx_typerep_conv/Manifest
+++ b/dev-ml/ppx_typerep_conv/Manifest
@@ -1 +1,2 @@
+DIST ppx_typerep_conv-0.14.1.tar.gz 9453 BLAKE2B 4acafdd51df0659746697283aa3240f1b1403e4e9f9b5fafa6c4b09f4c76f6ac645e2ccab53cba7371b5b004edba38d24198334d10b295d90c8ba5814a602a23 SHA512 6e32f6c2cf6c370fcb8d3b341dbd797c3b7c2557c8604253d744b266c9a3f4984e62ffe6ec5717044378f81e5b78e7f206a7f0f4b43c0dda97a4e7ece745d26d
 DIST ppx_typerep_conv-0.9.0.tar.gz 10844 BLAKE2B 4c21e9529c587507eef26fc53ae2c1153cbecd754d6b36b73ee6e639a13d872932a421207224c392394a52767f5fde66441cf19318499c8604c2e20b9583841a SHA512 155838bf6dce45a043624845ce882eee374df344f76a9433a1170d89cc27856a634f4ca31ad28e46b28c5103d00c3d8d7d79692872c5dfc35d0b4a7eebdb3d1d
diff --git a/dev-ml/ppx_typerep_conv/metadata.xml b/dev-ml/ppx_typerep_conv/metadata.xml
index becb16a3d46c..23f2e859b2a3 100644
--- a/dev-ml/ppx_typerep_conv/metadata.xml
+++ b/dev-ml/ppx_typerep_conv/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_typerep_conv</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild
new file mode 100644
index 000000000000..e1cb2971b753
--- /dev/null
+++ b/dev-ml/ppx_typerep_conv/ppx_typerep_conv-0.14.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Generation of runtime types from type declarations"
+HOMEPAGE="https://github.com/janestreet/ppx_typerep_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/typerep:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+	"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_variants_conv/Manifest b/dev-ml/ppx_variants_conv/Manifest
index e3c482db930f..750cc73a0e24 100644
--- a/dev-ml/ppx_variants_conv/Manifest
+++ b/dev-ml/ppx_variants_conv/Manifest
@@ -1 +1,2 @@
+DIST ppx_variants_conv-0.14.1.tar.gz 9640 BLAKE2B a73241a8dfc1cf41d2ad184f7e321484525794e66a1e881c822616aca6f8d221e9e699464716410a71ae3cbd542eef6315e0d183447e5e0e49bdb02935876375 SHA512 2ee21751de1595e56b151d87413554af5c0aaf92053ddd2834cadea812f1f59fcd078f6f4a9e9894eca9ffbf211ed2de996df065534c84256dc9670ee8fcbed5
 DIST ppx_variants_conv-0.9.0.tar.gz 10649 BLAKE2B 824405cce55213ab055fb576becba6b7c2111501ad9e2784fd4eb62c32edf1288eb66f1e8d4c0e78e6aeb8ecf4ad62819b767c4d0a7eedc5ddbd3803d60e028a SHA512 4bb7c087c835fe0c8debc25b66dab9da2da3a5ad4eef856845075a146a2fe3a2598a5b77851bd922b532b57cb821ee934336f8638d44cc0fd81faefcc56e1d89
diff --git a/dev-ml/ppx_variants_conv/metadata.xml b/dev-ml/ppx_variants_conv/metadata.xml
index eb825b2006d2..c250bb0849f9 100644
--- a/dev-ml/ppx_variants_conv/metadata.xml
+++ b/dev-ml/ppx_variants_conv/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/ppx_variants_conv</remote-id>
 	</upstream>
diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
new file mode 100644
index 000000000000..b2e4bc1bac36
--- /dev/null
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.14.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Generation of accessor and iteration functions for ocaml variant types"
+HOMEPAGE="https://github.com/janestreet/ppx_variants_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/variantslib:=
+	dev-ml/ppxlib:=
+		dev-ml/ocaml-migrate-parsetree:=
+			dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppxfind/Manifest b/dev-ml/ppxfind/Manifest
new file mode 100644
index 000000000000..2974266db1fe
--- /dev/null
+++ b/dev-ml/ppxfind/Manifest
@@ -0,0 +1 @@
+DIST ppxfind-1.4.tbz 4083 BLAKE2B 3661827c897a74af21f0d10c9435b74845fc4832cb1b50a510fdf7c33cd877faee5ddcb8307c65903a4692fcb58ca264e0c0b44433a34a59a12f8eb2917e12e9 SHA512 f80b0ee09fb536aa9f154da80d06a1b68ba3b10605fb7338bd6449beb5c8d00e983bf66b4a63e12659ae1410fea56d0a2c4cfd43584616438504628035bcb981
diff --git a/dev-ml/ppxfind/metadata.xml b/dev-ml/ppxfind/metadata.xml
new file mode 100644
index 000000000000..b40103350cee
--- /dev/null
+++ b/dev-ml/ppxfind/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">diml/ppxfind</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppxfind/ppxfind-1.4.ebuild b/dev-ml/ppxfind/ppxfind-1.4.ebuild
new file mode 100644
index 000000000000..6f6e5d665075
--- /dev/null
+++ b/dev-ml/ppxfind/ppxfind-1.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="ocamlfind ppx tool"
+HOMEPAGE="https://github.com/diml/ppxfind"
+SRC_URI="https://github.com/diml/ppxfind/releases/download/${PV}/${P}.tbz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/findlib:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
new file mode 100644
index 000000000000..c1e2284bfcf3
--- /dev/null
+++ b/dev-ml/ppxlib/Manifest
@@ -0,0 +1 @@
+DIST ppxlib-0.18.0.tar.gz 192929 BLAKE2B db14821aa77eac02038632ee8a9756ffd7a7b561c5852c4a5bb6882da531a6d2833737d4d1d372ff73251c168e2da57c7df0c724b1d9a6c4829632881aa4d2b3 SHA512 73b785eec34ca68451936c750ff68a4799b8c265cd973a587bd77b60cb933409eed4edfd4c9a4b0b1ada8d3a0bae5c5c719e4258d00cb0290a6842c67be1fd3d
diff --git a/dev-ml/ppxlib/metadata.xml b/dev-ml/ppxlib/metadata.xml
new file mode 100644
index 000000000000..c37ad7574836
--- /dev/null
+++ b/dev-ml/ppxlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml-ppx/ppxlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
new file mode 100644
index 000000000000..93be64e0890a
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Base library and tools for ppx rewriters "
+HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
+SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+
+DEPEND="
+	>=dev-ml/base-0.11.0:=
+	>=dev-ml/ocaml-compiler-libs-0.11:=
+	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
+		dev-ml/result:=
+	dev-ml/sexplib0:=
+	dev-ml/stdlib-shims:=
+	dev-ml/ppx_derivers:=
+	>=dev-ml/stdio-0.11.0:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	test? ( dev-ml/cinaps )"
diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest
new file mode 100644
index 000000000000..dff48b3bc245
--- /dev/null
+++ b/dev-ml/re/Manifest
@@ -0,0 +1 @@
+DIST ocaml-re-1.9.0.tar.gz 83642 BLAKE2B abcabb80ffef241fc7e8ea075f49365cc64f8749db1d1f7eb654eeb52f5be8e96756f98ae7903391a26d8537f82e105878a38a15923d7f93c61abd5c08d3ff98 SHA512 3e11c6eccf573ab5d7f43accf1f1ac9eda0d7320067e142b9f76b309315c1e30d22c5bb80c7a54b05d9c92d3518d26ea82b5093de9b48f86e3c62d6073f14eda
diff --git a/dev-ml/re/files/ounit2.patch b/dev-ml/re/files/ounit2.patch
new file mode 100644
index 000000000000..1210491bc142
--- /dev/null
+++ b/dev-ml/re/files/ounit2.patch
@@ -0,0 +1,11 @@
+Index: ocaml-re-1.9.0/lib_test/fort_unit/dune
+===================================================================
+--- ocaml-re-1.9.0.orig/lib_test/fort_unit/dune
++++ ocaml-re-1.9.0/lib_test/fort_unit/dune
+@@ -3,4 +3,4 @@
+ (library
+  (name fort_unit)
+  (wrapped false)
+- (libraries re oUnit))
+\ No newline at end of file
++ (libraries re ounit2))
diff --git a/dev-ml/re/metadata.xml b/dev-ml/re/metadata.xml
new file mode 100644
index 000000000000..5fa0f8468f55
--- /dev/null
+++ b/dev-ml/re/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/ocaml-re</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/re/re-1.9.0.ebuild b/dev-ml/re/re-1.9.0.ebuild
new file mode 100644
index 000000000000..28f3f672a069
--- /dev/null
+++ b/dev-ml/re/re-1.9.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Regular expression library for OCaml"
+HOMEPAGE="https://github.com/ocaml/ocaml-re"
+SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz -> ocaml-${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt test"
+
+RDEPEND="!dev-ml/ocaml-re
+	dev-ml/seq:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )"
+S="${WORKDIR}/ocaml-${P}"
+PATCHES=( "${FILESDIR}/ounit2.patch" )
diff --git a/dev-ml/react/react-1.2.1-r1.ebuild b/dev-ml/react/react-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..961c0c0dde43
--- /dev/null
+++ b/dev-ml/react/react-1.2.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit opam
+
+DESCRIPTION="OCaml module for functional reactive programming"
+HOMEPAGE="http://erratique.ch/software/react https://github.com/dbuenzli/react"
+SRC_URI="http://erratique.ch/software/react/releases/${P}.tbz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ml/findlib
+	>=dev-ml/topkg-0.9
+"
+
+src_compile() {
+	ocaml pkg/pkg.ml build \
+		--tests $(usex test 'true' 'false') \
+		|| die
+}
+
+src_test() {
+	ocaml pkg/pkg.ml test || die
+}
diff --git a/dev-ml/result/Manifest b/dev-ml/result/Manifest
index f2af9475afe7..a15c2e990f55 100644
--- a/dev-ml/result/Manifest
+++ b/dev-ml/result/Manifest
@@ -1 +1,2 @@
 DIST result-1.2.tar.gz 2100 BLAKE2B 9c746c85200ad6af1014dbc4959347b19f48f24448fb36a33b0b50f8d3d8cf4536f7ea3e994953d29122c8dafe87289707eeab67f7a0dc44d0bc509715169e79 SHA512 b47fe24302182642c7dfb3329a9a475518fca01ed7080fb625379abbb7ada0bec4a27e666886c101ba4b0083eeb6312740d99ef764690d38ee6e6d8960fc9b87
+DIST result-1.5.tar.gz 2291 BLAKE2B 76010676aa806fac3766e9ba70b770b3bd01347b1365892beba4c33415d0942a9368f0437ee5a8339b355b939d1625b2fa9c8ad4cf774007637eb51f4b20f11b SHA512 5ca3aab3b46bff7f4fa4517b5d823de196d7a97a8b94a8e416a5e237061482f4d0030c6a339291d5aa8f68020ee11aed743b730970105a2303e6a93d26ca676a
diff --git a/dev-ml/result/metadata.xml b/dev-ml/result/metadata.xml
index 3fca8513dd2e..ffa2962f92c9 100644
--- a/dev-ml/result/metadata.xml
+++ b/dev-ml/result/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/result</remote-id>
 	</upstream>
diff --git a/dev-ml/result/result-1.5.ebuild b/dev-ml/result/result-1.5.ebuild
new file mode 100644
index 000000000000..eb1d6d56a383
--- /dev/null
+++ b/dev-ml/result/result-1.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Compat result type"
+HOMEPAGE="https://github.com/janestreet/result"
+SRC_URI="https://github.com/janestreet/result/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/seq/files/META.seq b/dev-ml/seq/files/META.seq
new file mode 100644
index 000000000000..06b95eff3f8d
--- /dev/null
+++ b/dev-ml/seq/files/META.seq
@@ -0,0 +1,4 @@
+name="seq"
+version="[distributed with OCaml 4.07 or above]"
+description="dummy backward-compatibility package for iterators"
+requires=""
diff --git a/dev-ml/seq/files/seq.install b/dev-ml/seq/files/seq.install
new file mode 100644
index 000000000000..c4d70206e13f
--- /dev/null
+++ b/dev-ml/seq/files/seq.install
@@ -0,0 +1,3 @@
+lib:[
+  "META.seq" {"META"}
+]
diff --git a/dev-ml/seq/metadata.xml b/dev-ml/seq/metadata.xml
index d0e866f244f8..000cf86e43c1 100644
--- a/dev-ml/seq/metadata.xml
+++ b/dev-ml/seq/metadata.xml
@@ -5,4 +5,8 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-ml/seq/seq-1.ebuild b/dev-ml/seq/seq-1.ebuild
new file mode 100644
index 000000000000..d76fea7d78bd
--- /dev/null
+++ b/dev-ml/seq/seq-1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit opam
+
+DESCRIPTION="Compatibility package for OCaml's standard iterator type starting from 4.07."
+HOMEPAGE="https://github.com/ocaml/opam-repository/blob/master/packages/seq/seq.base/opam"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+"
+BDEPEND=""
+S="${WORKDIR}"
+
+src_prepare() {
+	cp "${FILESDIR}/"{seq.install,META.seq} "${S}/" || die
+	default
+}
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index efd0978a7744..aeaaf4465188 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -1,2 +1,3 @@
+DIST sexplib-0.14.0.tar.gz 54055 BLAKE2B d0ee1470fb9d28eb6d6ed3aaf0f6bd63d7c4860183ac287054f08bc54d57d0c52ebf9fe516aa991d8c66967ecc6ad95b6a6d19eb40a9f610a6f91f832d9d2e20 SHA512 e77a9ae8991e6b73de57ab6b7068d6482471dd34ff0af23b93b5ba57bd69493d15db3279d3b328280f716e531c08c2a6c39bfaa886f1934240dcc13724673684
 DIST sexplib-0.9.2.tar.gz 75035 BLAKE2B c08e4285cc36fe259d5145d43c847bc466e0b4d9897c58708ce39e6b04d52c84cc5c7603f296edaf6c0752c846d9cb9b03c9610eb5d3fd9bc1b1ad67b4a046cd SHA512 d9e02ae9e7e8be4387c5d4e5c4a23222e2ebbd3355d52c26e0d6ac0ccc4f4e09653ac2852e6698d6128ff954888e65d97dd7a494b9404bad2e8349cd592bab1d
 DIST sexplib-0.9.3.tar.gz 75074 BLAKE2B 60ddb336f8ff334f995399e63a12d9ab5403ed27bf62259d13159eed0a5c6b246673406ca9ed9f542cdc4e53460a5136f56fe75127ea199448e85dd55cf53ff3 SHA512 32c471b3ef2b2595fed7fa748b7bc7059491651442dec0bca5a60b93458d78b0950e4386a973c9c856ba25f3f839d6747ab9e2e88b1927f9907e8107b63b706d
diff --git a/dev-ml/sexplib/metadata.xml b/dev-ml/sexplib/metadata.xml
index 214264c2beb2..33a396fe6e79 100644
--- a/dev-ml/sexplib/metadata.xml
+++ b/dev-ml/sexplib/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
-    <remote-id type="github">janestreet/sexplib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+		<remote-id type="github">janestreet/sexplib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/sexplib/sexplib-0.14.0.ebuild b/dev-ml/sexplib/sexplib-0.14.0.ebuild
new file mode 100644
index 000000000000..c30d06dc3c12
--- /dev/null
+++ b/dev-ml/sexplib/sexplib-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="https://github.com/janestreet/sexplib"
+SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/parsexp:=
+		dev-ml/base:=
+	dev-ml/sexplib0:=
+	dev-ml/num:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/sexplib0/Manifest b/dev-ml/sexplib0/Manifest
new file mode 100644
index 000000000000..56aad71a87ba
--- /dev/null
+++ b/dev-ml/sexplib0/Manifest
@@ -0,0 +1 @@
+DIST sexplib0-0.14.0.tar.gz 17677 BLAKE2B bf906491cd8c8021b6737fa6a9510ad7421a01c448bd1e136cd7244eaeb27674a4c3e739be601a66b1f23a2f6dd2f19771b66fde88a2f3e75e24111ae5ace3e5 SHA512 cfffb390809a1ed3b99d3326a7c5035e2fedf7af084d94f6c0cff98ba641056b5b2896d56d32b1b27bdde29b199bbd32d174cdee84c2e1541cb7f2e4bf00e4ed
diff --git a/dev-ml/sexplib0/metadata.xml b/dev-ml/sexplib0/metadata.xml
new file mode 100644
index 000000000000..e579604e5a49
--- /dev/null
+++ b/dev-ml/sexplib0/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/sexplib0</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/sexplib0/sexplib0-0.14.0.ebuild b/dev-ml/sexplib0/sexplib0-0.14.0.ebuild
new file mode 100644
index 000000000000..575d94f788a7
--- /dev/null
+++ b/dev-ml/sexplib0/sexplib0-0.14.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="https://github.com/janestreet/sexplib0"
+SRC_URI="https://github.com/janestreet/sexplib0/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/splittable_random/Manifest b/dev-ml/splittable_random/Manifest
new file mode 100644
index 000000000000..4b4e05848579
--- /dev/null
+++ b/dev-ml/splittable_random/Manifest
@@ -0,0 +1 @@
+DIST splittable_random-0.14.0.tar.gz 9942 BLAKE2B 3147e290cbf7a6e2ce8994ce0f95f392a4f7f24f7c2b6fd1b5394ec537e8be7efbefebcb8f2794e026cdd30596e6defde86126646b19f6d299ee79dbaa4d4bb7 SHA512 c8c006bba0f74e53892d9fd364de4d822182ce5371deae4f5d881d59ad6b9a8a429ac6aca54ae95edf312565b87e89a2c2546a349b2e6de2a78ece0655a09b94
diff --git a/dev-ml/splittable_random/metadata.xml b/dev-ml/splittable_random/metadata.xml
new file mode 100644
index 000000000000..22ce63f341b2
--- /dev/null
+++ b/dev-ml/splittable_random/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/splittable_random</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/splittable_random/splittable_random-0.14.0.ebuild b/dev-ml/splittable_random/splittable_random-0.14.0.ebuild
new file mode 100644
index 000000000000..ae0ef5567b6f
--- /dev/null
+++ b/dev-ml/splittable_random/splittable_random-0.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="PRNG that can be split into independent streams"
+HOMEPAGE="https://github.com/janestreet/splittable_random"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/base:=
+	dev-ml/ppx_assert:=
+	dev-ml/ppx_bench:=
+	dev-ml/ppx_inline_test:=
+	dev-ml/ppx_sexp_message:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/stdio/Manifest b/dev-ml/stdio/Manifest
index 169768ab7a6b..9c234297cb4c 100644
--- a/dev-ml/stdio/Manifest
+++ b/dev-ml/stdio/Manifest
@@ -1,2 +1,3 @@
+DIST stdio-0.14.0.tar.gz 7867 BLAKE2B e9aa9727489bf59350fe87323689a5c4f5bf710bb4932b0153c4ad742db5fe03a05728d86c281796cb77d1aef9ba2cc1b236630cb125d1d182c54c344a0ee335 SHA512 74cac04bd6b1be8c13f739445185286a910f66877cb61c8f22b4027dbc3f82021030d55eb7c8471bac850fc7c0f86462a8e26653c7a08c95fb7eea16512c5f61
 DIST stdio-0.9.0.tar.gz 9264 BLAKE2B 1f3d7748ed07672eaad7c747c8925fb9e5204d59c05e8ee8674d689dcc44b9ae9d2da8420cfa05e8e0a58bded343cba979ff42f5f8fdae5392a1868591269f32 SHA512 a3809272c00653872d02b07b6c133215e06a70a7cbebed8c6c22ba5790ee8cbba17821da7875290c8869dfac22bf3cf248028e2aed2570195ca9b5f63b6ab75d
 DIST stdio-0.9.1.tar.gz 9281 BLAKE2B fa3a5a3877aa2ab19155d865eea03458b742224de11857f9f2c1219eef3f0fbd6562cf0eafc90c59dab03053db0dcae27c19a73da4f3a73e3b6d6a9407868f3d SHA512 bfef782562af7fae790b8baf02bf5d5edae2ccff29531080a608fd9224710c7d0a1a346c3480b6eaf4d7be1a280e19d9380a4dd9072de6d68e48ac419d275716
diff --git a/dev-ml/stdio/metadata.xml b/dev-ml/stdio/metadata.xml
index ce97306373ea..07fb8f069c5a 100644
--- a/dev-ml/stdio/metadata.xml
+++ b/dev-ml/stdio/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/stdio</remote-id>
 	</upstream>
diff --git a/dev-ml/stdio/stdio-0.14.0.ebuild b/dev-ml/stdio/stdio-0.14.0.ebuild
new file mode 100644
index 000000000000..d80adb8df65e
--- /dev/null
+++ b/dev-ml/stdio/stdio-0.14.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Standard IO Library for OCaml"
+HOMEPAGE="https://github.com/janestreet/stdio"
+SRC_URI="https://github.com/janestreet/stdio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	>=dev-ml/base-0.11.0:=
+		dev-ml/sexplib0:="
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
index bedd6b873ecc..ca9b60a4f1d7 100644
--- a/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
+++ b/dev-ml/stdlib-shims/stdlib-shims-0.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="ocamlopt"
 
 DOCS=( "README.md" "CHANGES.md" "LICENSE" )
diff --git a/dev-ml/time_now/Manifest b/dev-ml/time_now/Manifest
new file mode 100644
index 000000000000..ac58278f0442
--- /dev/null
+++ b/dev-ml/time_now/Manifest
@@ -0,0 +1 @@
+DIST time_now-0.14.0.tar.gz 3666 BLAKE2B 131d4b585ac981fe306ea93f17e332cfabe86a3f8f4564a76e4dc694f9c624e91fe0f0ce26a4ada9fdf0239033fcd29065d76a37e6fb4b79927d116531c04909 SHA512 1b6d1a754e46f1756aa2aad3590e5052999f567630297491d62228ad733b189fbbfc0589b7bafd74e9f77ca0c0421093054e9062d2d5a7d7ed05930be67e9a5f
diff --git a/dev-ml/time_now/metadata.xml b/dev-ml/time_now/metadata.xml
new file mode 100644
index 000000000000..b78a86fdab86
--- /dev/null
+++ b/dev-ml/time_now/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">janestreet/time_now</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/time_now/time_now-0.14.0.ebuild b/dev-ml/time_now/time_now-0.14.0.ebuild
new file mode 100644
index 000000000000..fd5dabc3a0c2
--- /dev/null
+++ b/dev-ml/time_now/time_now-0.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Reports the current time"
+HOMEPAGE="https://github.com/janestreet/time_now"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-ml/base:=
+	dev-ml/jane-street-headers:=
+	dev-ml/jst-config:=
+	dev-ml/ppx_base:=
+	dev-ml/ppx_optcomp:=
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/topkg/Manifest b/dev-ml/topkg/Manifest
index aa688bfebc4c..28c8e6e433ec 100644
--- a/dev-ml/topkg/Manifest
+++ b/dev-ml/topkg/Manifest
@@ -1,2 +1,3 @@
 DIST topkg-0.9.0.tar.gz 120352 BLAKE2B 1122fe8b60e3d104136810a2cec8460c24a26061eff55e80347d2ecf197afee949e8afaca94a6615da31a8c3acaf113b44b16dbf2430fda6724e440597775bb5 SHA512 823fe1abb344d7800e09411c952bd276ecea97b5d9c124d986e26b9128d03b3ad023a38560198e476ef8f949ecb456078e332bda94075e9b746e43d3059a8fdb
 DIST topkg-0.9.1.tar.gz 120943 BLAKE2B 39ac0d1d247183cf9f007c65b09d413ad6a89982d84269e99585ed5f15df4d7683de61548dba6ca5a1299f96206bfd2dc1042486410caa202938dc15e936446b SHA512 19773eb764b53a6e5110c44d7942d2557d6c8502a3037b57f7737efc08f4cc374845b431fdb1465207693d15a4b072aea3db97f8e60e069e3d24ae150e8c5c8f
+DIST topkg-1.0.3.tar.gz 122302 BLAKE2B c3c583fe6d9c6602c9eeae6ba76f0b8e1eda754cb2ffed8f6a9b51eeea53a2d16ad0af5bf3bf1f257233481efd1e7fecfca7185773dcb4258f6a0a8195aaf61f SHA512 b4f3393b142c5c2d71bb4a25f5af020831bd48ad5c354b68cf5a2df2044b534024f0568da93ad26ca383c97ba4277b4878dba7ce9267146f3805c67f52950cbf
diff --git a/dev-ml/topkg/metadata.xml b/dev-ml/topkg/metadata.xml
index 5c8e10a7c535..5b0819cca142 100644
--- a/dev-ml/topkg/metadata.xml
+++ b/dev-ml/topkg/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">dbuenzli/topkg</remote-id>
 	</upstream>
diff --git a/dev-ml/topkg/topkg-1.0.3.ebuild b/dev-ml/topkg/topkg-1.0.3.ebuild
new file mode 100644
index 000000000000..904be8296bff
--- /dev/null
+++ b/dev-ml/topkg/topkg-1.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="The transitory OCaml software packager"
+HOMEPAGE="http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg"
+SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/result:=
+	dev-ml/ocamlbuild:=
+	dev-ml/findlib:=
+	dev-lang/ocaml:="
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	ocaml pkg/pkg.ml build --pkg-name ${PN} || die
+}
+
+src_install() {
+	# Can't use opam-installer here as it is an opam dep...
+	findlib_src_preinst
+	local nativelibs="$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)"
+	ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die
+	dodoc CHANGES.md DEVEL.md README.md
+}
diff --git a/dev-ml/typerep/Manifest b/dev-ml/typerep/Manifest
index fdb39cf95717..1731337c5df1 100644
--- a/dev-ml/typerep/Manifest
+++ b/dev-ml/typerep/Manifest
@@ -1 +1,2 @@
+DIST typerep-0.14.0.tar.gz 22936 BLAKE2B 353a42f0f14bf6cbfc88670ca3d42af5873db1fcf805c30d03e95990ccd6d5fe2f5604931dc213fa921683de639717d288b2eac620cc2a4981cb792a65736e8d SHA512 53b719ee06d06d7833cbe57811fe54d57a36055fa8e4255909273a267000e20628b8b8f6d27c22385753ea461d461f87a1eb1fc9711c52405a89d1493f54f37f
 DIST typerep-0.9.0.tar.gz 24934 BLAKE2B 83e0cd9419c11a1b8dbce6730404dbe4b00597e441943d8315ad5a583ff50376c95413695e327996b07557b1b481df8ab15db5b37c3ac4c8396b7ed51aa822ea SHA512 f71fa3968ff5e93c384a97e2d39af0de33f4889643a7e43d70a777214dc4c7f35b3fac0864ffee99334cf03866a695f7afd1a907d5c7f3cec0d472b729adf9cc
diff --git a/dev-ml/typerep/metadata.xml b/dev-ml/typerep/metadata.xml
index 39191cd86181..f3f7dc32a8b3 100644
--- a/dev-ml/typerep/metadata.xml
+++ b/dev-ml/typerep/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 -->
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">janestreet/typerep</remote-id>
 	</upstream>
diff --git a/dev-ml/typerep/typerep-0.14.0.ebuild b/dev-ml/typerep/typerep-0.14.0.ebuild
new file mode 100644
index 000000000000..6669dd8700f9
--- /dev/null
+++ b/dev-ml/typerep/typerep-0.14.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Library for creating runtime representation of OCaml types"
+HOMEPAGE="https://github.com/janestreet/typerep"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt"
+
+DEPEND="dev-ml/base:="
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/variantslib/Manifest b/dev-ml/variantslib/Manifest
index af9ea63e9790..b5ae755776b8 100644
--- a/dev-ml/variantslib/Manifest
+++ b/dev-ml/variantslib/Manifest
@@ -1 +1,2 @@
+DIST variantslib-0.14.0.tar.gz 2951 BLAKE2B a3197f7e06d4340ae73d76d477fd1e0ce038b4829aa3a9d0e0ea3e5251f9ca7c43798005138993a16c860ebf4d08a7e54621359c2a030f3866b62a02de4c326f SHA512 0cb18475668eb8e6091f8a779587f0d643dd0325b0f8518e53469dd12769a3ed6fa4f9c2651a21f8b07992d7b29f6664c4d3bf49f46ed6d7002de07b5014e4f3
 DIST variantslib-0.9.0.tar.gz 5590 BLAKE2B 8b6b4c1e1d21e7f6c9bdc1813ea811dc4680506a2a8b2f8c869d8ba2583f07e99d717c0f6a984f6ca3c2e809c9eb2e7c497dcde1f0085e054de383b032f3e94e SHA512 2fd28063d307396da866be70480ba7f953d90ec32a55d31dad649eadb6141572e428f055cad02787654477c4a308313ecb7be4b9b80828af9d9870ad325b9f4d
diff --git a/dev-ml/variantslib/metadata.xml b/dev-ml/variantslib/metadata.xml
index 0abb370a4464..fa46caee57a0 100644
--- a/dev-ml/variantslib/metadata.xml
+++ b/dev-ml/variantslib/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
-    <remote-id type="github">janestreet/variantslib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+		<remote-id type="github">janestreet/variantslib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/variantslib/variantslib-0.14.0.ebuild b/dev-ml/variantslib/variantslib-0.14.0.ebuild
new file mode 100644
index 000000000000..7d9224c80bd9
--- /dev/null
+++ b/dev-ml/variantslib/variantslib-0.14.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="OCaml variants as first class values"
+HOMEPAGE="https://github.com/janestreet/variantslib"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/base:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index da0718defd26..f131a7370389 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/args/Manifest b/dev-python/args/Manifest
deleted file mode 100644
index a45d96dfc8d1..000000000000
--- a/dev-python/args/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST args-0.1.0.tar.gz 3048 BLAKE2B 4f31ec64f740640c9c927585ae35877654eb99beb5f0673ce8561ee093efd8b69eb5cb0c08a304c2319a38496935b62286f8bb9b2f1dca7c9447671ab0e3732f SHA512 664d33386af2ac0b9d30344db5fb5cea4210f600df28708ada19266afec237d6e6d9d57f03c8b64cfdbb6a17eff05f633a2cc4ddbfedc320dd133be246aee033
diff --git a/dev-python/args/args-0.1.0-r1.ebuild b/dev-python/args/args-0.1.0-r1.ebuild
deleted file mode 100644
index 764790c48a5c..000000000000
--- a/dev-python/args/args-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command Arguments for Humans"
-HOMEPAGE="https://github.com/kennethreitz-archive/args"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/astor/astor-0.8.1.ebuild b/dev-python/astor/astor-0.8.1.ebuild
index 92fa5a93e1fc..c233d3d04d9b 100644
--- a/dev-python/astor/astor-0.8.1.ebuild
+++ b/dev-python/astor/astor-0.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
index db0d224232a4..677f0b8d9890 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index db0d224232a4..677f0b8d9890 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 3a7d24071751..a0eca64e6e4c 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -4,3 +4,4 @@ DIST cfn-python-lint-0.36.0.tar.gz 4879599 BLAKE2B a79a12290e20f4db1e45b29df0486
 DIST cfn-python-lint-0.36.1.tar.gz 4963743 BLAKE2B 31efc227bf2b5aafff0365d0ca949e4007684dd896e6e8a75afb692a260e05f6b134b9cc822855c99edec7398a1cdd767a71557ef7178ff9054c4e737a5a5ec5 SHA512 4682b7a010875df2322856e9a01aa547fcce171c5bb7531ee35d92bcf0cfc523f78b4180fcc6a6c4a1460d5b517e834ce0e0026fa6c2f6afb9ebf3b3c46434bd
 DIST cfn-python-lint-0.37.0.tar.gz 4990073 BLAKE2B 447e7685f5ae7d4a610512729d2ecda48f4838f2b2f22ae80cdfef53d52cd929953014f2f2779ca7d340ed88287bf6b4f221e3be3b69b10335fb6716104f44ca SHA512 4ef0763c0995baf196098aa1499b22400cf5fd44f1f519d391314c6e199091a22b2179d1b1cabae6cddc27a85673c294fc65c02b92d864a9546ceb5c42264590
 DIST cfn-python-lint-0.37.1.tar.gz 5005775 BLAKE2B f393f4b871a8782e81f71a1a2d011d5d59dee287fa305d1b6c82ac366e7975e5ff02ce96949501ed883c2b86cc6547d148d19d5153bf1b77a675a1b8c33ba96d SHA512 8e2d3419142527431835f935f96bea972057eb471894ddc2b3867ce3cbe490d540fe9b1490b79c84042eba8e5f997cab1aae5aff862aaefeda38351babb04a2f
+DIST cfn-python-lint-0.38.0.tar.gz 5030920 BLAKE2B 3df51d77753ad8f2d8ea76ee2ac8b0c7e89ece043c75503272ee2683dee3a6280ff4f27c3df813b2532b3ee495b3a336b1c82ef649255cf1adea34bcc2fcf7db SHA512 1daf122735a22121e22f448c5867715507ef776a4fb7748c092818302e3226bcd368f03bad22709808864376bd63a916c66a8800a859da7c4d1deae40feaca2d
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.38.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.38.0.ebuild
new file mode 100644
index 000000000000..c96b0418260f
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.38.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" -m unittest discover -v ||
+		die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
index 916446ae3c5b..648458fd5618 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1 +1,2 @@
 DIST empy-3.3.3.tar.gz 138429 BLAKE2B ed2ea352161bcd141620253e059255c6d6437d72d8e72075e1abc01efc496715ff07eb1e9baef70a631e752761f828f2f4750087da154c0a6df1434e47a8f0b7 SHA512 74c091d6dac39ad9ddb6f46963066dab1f8846565f77b1b0ad4352eda3534d4312b0e95d3682387d75c2f5553d678c6d3112471eec032e2bdea0e891dd8217b1
+DIST empy-3.3.4.tar.gz 138495 BLAKE2B 0040b26966d3d6c7911cc7957159084ddb610085affaa5cf214121fdb292c43b071df8990749e02c0c3ef46cba131188e0907b8ab7c28a0834498b505bec0a2e SHA512 5de8de26484468d180a2575bfc8302cb3d32004ed4d70768310b7564a9ed1bb880b8c1d862f419588b2b5baa8c3da8bc707eac41f3921e6136cc5bc3f47f1a3d
diff --git a/dev-python/empy/empy-3.3.4.ebuild b/dev-python/empy/empy-3.3.4.ebuild
new file mode 100644
index 000000000000..fa463ba9b70d
--- /dev/null
+++ b/dev-python/empy/empy-3.3.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A powerful and robust templating system for Python"
+HOMEPAGE="http://www.alcyone.com/software/empy/"
+SRC_URI="http://www.alcyone.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="doc"
+
+python_test() {
+	"${PYTHON}" em.py sample.em | diff sample.bench -
+	if [[ ${PIPESTATUS[0]} -ne 0 || ${PIPESTATUS[1]} -ne 0 ]]; then
+		die "Testing failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodir /usr/share/doc/"${PF}"/examples
+		insinto /usr/share/doc/"${PF}"/examples
+		doins sample.em sample.bench
+		#3.3 has the html in this funny place. Fix in later version:
+		dohtml doc/home/max/projects/empy/doc/em/*
+		dohtml doc/home/max/projects/empy/doc/em.html
+		dohtml doc/index.html
+	fi
+}
diff --git a/dev-python/exdown/Manifest b/dev-python/exdown/Manifest
new file mode 100644
index 000000000000..120fe115bbf0
--- /dev/null
+++ b/dev-python/exdown/Manifest
@@ -0,0 +1 @@
+DIST exdown-0.7.0.tar.gz 4592 BLAKE2B 00d53d19a44775a486b2f2133dfc7956e0dc724397e4c2729ab20123aea4841b4f450d28d89b5ee93a540b775099e70d1eb4a9917bec88be784d916518b06c0d SHA512 25c99e219d722ba1280119b7affd4bc83aa2e3b83ad60f74a7dca24c0f64a14acd3d4a0b116474cc4a3d3e4507c7b1300d9afecc14d2e3f400a5d4234334c5ee
diff --git a/dev-python/exdown/exdown-0.7.0.ebuild b/dev-python/exdown/exdown-0.7.0.ebuild
new file mode 100644
index 000000000000..6121e9c8720e
--- /dev/null
+++ b/dev-python/exdown/exdown-0.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extract code blocks from markdown"
+HOMEPAGE="https://github.com/nschloe/exdown"
+SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$( python_gen_cond_dep \
+		'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 )
+"
+
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# setup.py was removed in commit ddb8a613bbc8ba7d079c1b7abbca5ce2d53ef9d0
+	# for some reason, DISTUTULS_USE_SETUPTOOLS="pyproject.toml" is not working
+	# it complains about file not found, setup.cfg does exist
+	cat > setup.py <<EOF || die
+from setuptools import setup
+
+if __name__ == "__main__":
+	setup()
+EOF
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/exdown/metadata.xml b/dev-python/exdown/metadata.xml
new file mode 100644
index 000000000000..99d8fdee9cb0
--- /dev/null
+++ b/dev-python/exdown/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nschloe/exdown</remote-id>
+		<remote-id type="pypi">exdown</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild b/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
index 677afeb84b7f..3b748ce2122f 100644
--- a/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
+++ b/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jinglemansweep/${PN}/archive/${EGIT_COMMIT}.tar.gz -
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-misc/lcdproc"
 
diff --git a/dev-python/lz4/lz4-3.0.2.ebuild b/dev-python/lz4/lz4-3.0.2.ebuild
index f766f1f58c75..81d3c0303da7 100644
--- a/dev-python/lz4/lz4-3.0.2.ebuild
+++ b/dev-python/lz4/lz4-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/marshmallow/marshmallow-3.5.1.ebuild b/dev-python/marshmallow/marshmallow-3.5.1.ebuild
index 37a0ebcd4cc9..0c76b8840cb9 100644
--- a/dev-python/marshmallow/marshmallow-3.5.1.ebuild
+++ b/dev-python/marshmallow/marshmallow-3.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(  python3_{6,7,8} )
+PYTHON_COMPAT=(  python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild b/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
index b5e77f3dc0be..e3bef8c594d5 100644
--- a/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
+++ b/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rbarrois/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/python-mpd"
 
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-0.1.10.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-0.1.10-r1.ebuild
similarity index 89%
rename from dev-python/osrf_pycommon/osrf_pycommon-0.1.10.ebuild
rename to dev-python/osrf_pycommon/osrf_pycommon-0.1.10-r1.ebuild
index d38cfc41188e..9f8238dc18f6 100644
--- a/dev-python/osrf_pycommon/osrf_pycommon-0.1.10.ebuild
+++ b/dev-python/osrf_pycommon/osrf_pycommon-0.1.10-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-python/paste/paste-3.4.4.ebuild b/dev-python/paste/paste-3.4.4.ebuild
index 5bbbe51a411a..5015b7c191bc 100644
--- a/dev-python/paste/paste-3.4.4.ebuild
+++ b/dev-python/paste/paste-3.4.4.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pgspecial/pgspecial-1.11.9.ebuild b/dev-python/pgspecial/pgspecial-1.11.9.ebuild
index 4f2e362cbe18..1d69bbdadf42 100644
--- a/dev-python/pgspecial/pgspecial-1.11.9.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.11.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild
index 4d3183b1591b..edac4c6caf91 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
index 52d88a552934..6ad4f27a027c 100644
--- a/dev-python/pycups/pycups-1.9.73-r2.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1
diff --git a/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
index 29678aafee36..4209e0be8c6d 100644
--- a/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 2623be7a0b67..099f297e9dee 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1 +1,2 @@
 DIST pylint-2.5.3.tar.gz 684449 BLAKE2B 7b494f5334376ff571fd8971851198d037e87c5be83d0123fcb108701489769785164bb077eb10b4851c89b82dadc40c510186eaf03be1621c4d78c79dffbceb SHA512 03fcd893d361b66794f17433e90df108099fee2eccb35507c7f61befb8db846f0242e5ce2b4ee63727c9cc780a376c3b93d5af3186f884a4fdaad68b224ed7d2
+DIST pylint-2.6.0.tar.gz 680289 BLAKE2B f7d4159478f667a3234beefd148857f26c8f7ea3aae3bfa70fa06fe2a8d86fcf22a0727a9fa5d8fc3de4aa0bb7a4d6e13bf68029f359122762d1e0d24a0b715b SHA512 02881fe14401bbe946618ef947c8db320a6c8dd93626402260d60468538ce67b61d1e8b921bfb1a6020514dd392e9b0021c97ddb60b45866c2d2241224f93f08
diff --git a/dev-python/pylint/pylint-2.6.0.ebuild b/dev-python/pylint/pylint-2.6.0.ebuild
new file mode 100644
index 000000000000..3f3e19709ba7
--- /dev/null
+++ b/dev-python/pylint/pylint-2.6.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Not ready for Python 3.9 yet: https://github.com/PyCQA/pylint/issues/3895
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+# Mirror requirements from pylint/__pkginfo__.py
+RDEPEND="
+	>=dev-python/astroid-2.4.0[${PYTHON_USEDEP}]
+	<=dev-python/astroid-2.5[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+	"${FILESDIR}/${PN}-2.5.3-tests.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# we don't want to run the benchmarking tests
+	rm -f tests/benchmark/test_baseline_benchmarks.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
+}
diff --git a/dev-python/pymilter/pymilter-1.0.4-r1.ebuild b/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
index 5a706a8fdf00..1f25224ecd8e 100644
--- a/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
+++ b/dev-python/pymilter/pymilter-1.0.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sdgathman/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest-pylint/Manifest b/dev-python/pytest-pylint/Manifest
index 0c5391f7428a..9160ce15a41e 100644
--- a/dev-python/pytest-pylint/Manifest
+++ b/dev-python/pytest-pylint/Manifest
@@ -1 +1,2 @@
 DIST pytest-pylint-0.14.1.tar.gz 8144 BLAKE2B d78892e3e606ec588b48a252db447e1cc76e27e45606670da3a3acddf040485004a7af84474732b044fdbf80ad760c07fda5e35030b9b2c9e5ce89f4809529c2 SHA512 697cd40e8e4c3722e382c7fd2dbebcb1728675e35b60396628576ec09735595af56431a2c080f29a2f35f304d912c80e4afdf0f8bd21a3adeae3156b9e58c751
+DIST pytest-pylint-0.17.0.tar.gz 11660 BLAKE2B b536dcaaf0ac652dcbe66018fa22e120782496de58f74003c523eb003ff0556f9b738e528a85724a1e589e18bb0024d99fbeb581b7f5b36ec349ad07da8d26d0 SHA512 a23937ec191ef14829530ac6bf31b882bc250f312e2ba6e3b8cc1187c888511e4b67ffaf5bce176556a621fbf80239b30c43c635898d458bb8d819e92a9f8142
diff --git a/dev-python/pytest-pylint/metadata.xml b/dev-python/pytest-pylint/metadata.xml
index 0e3bc0471a62..4f79f21e49ec 100644
--- a/dev-python/pytest-pylint/metadata.xml
+++ b/dev-python/pytest-pylint/metadata.xml
@@ -6,5 +6,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">carsongee/pytest-pylint</remote-id>
+		<remote-id type="pypi">pytest-pylint</remote-id>
+		<bugs-to>https://github.com/carsongee/pytest-pylint/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild
new file mode 100644
index 000000000000..fd41ba8504b1
--- /dev/null
+++ b/dev-python/pytest-pylint/pytest-pylint-0.17.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin to check source code with pylint"
+HOMEPAGE="https://github.com/carsongee/pytest-pylint"
+# Tests should be included in PyPI tarballs by the next release:
+# https://github.com/carsongee/pytest-pylint/commit/4e7f06701ca06697a22a029db9857fa2fdf7c033
+SRC_URI="https://github.com/carsongee/pytest-pylint/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pylint-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Disable flake8 and pep8 options
+	sed -i -e '/^addopts =/d' tox.ini || die
+	# Remove pytest-runner requirement
+	sed -i -e "s/'pytest-runner'//" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Required to load the pytest-pylint plugin
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild
index 858c1bae05a0..0b4515918814 100644
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.4.0.ebuild
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.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"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/python-language-server/python-language-server-0.35.1.ebuild b/dev-python/python-language-server/python-language-server-0.35.1.ebuild
index 947c489ba063..accbbcbea814 100644
--- a/dev-python/python-language-server/python-language-server-0.35.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.35.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch b/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
index b02f18747cfe..6c8d93ed62e7 100644
--- a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
+++ b/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
@@ -16,10 +16,10 @@ operator. This PR makes this known to SIP as well.
  python_orocos_kdl/PyKDL/kinfam.sip   | 29 ++++++++++++++++++++++++++++
  2 files changed, 32 insertions(+)
 
-diff --git a/python_orocos_kdl/PyKDL/dynamics.sip b/python_orocos_kdl/PyKDL/dynamics.sip
+diff --git a/PyKDL/dynamics.sip b/python_orocos_kdl/PyKDL/dynamics.sip
 index e0096dd..36f833c 100644
---- a/python_orocos_kdl/PyKDL/dynamics.sip
-+++ b/python_orocos_kdl/PyKDL/dynamics.sip
+--- a/PyKDL/dynamics.sip
++++ b/PyKDL/dynamics.sip
 @@ -72,4 +72,7 @@ public:
      int JntToCoriolis(const JntArray &q, const JntArray &q_dot, JntArray &coriolis);
  	int JntToMass(const JntArray &q, JntSpaceInertiaMatrix& H);
@@ -28,10 +28,10 @@ index e0096dd..36f833c 100644
 +private:
 +    ChainDynParam& operator=(const ChainDynParam&);
  };
-diff --git a/python_orocos_kdl/PyKDL/kinfam.sip b/python_orocos_kdl/PyKDL/kinfam.sip
+diff --git a/PyKDL/kinfam.sip b/python_orocos_kdl/PyKDL/kinfam.sip
 index d87fd00..e87ceb8 100644
---- a/python_orocos_kdl/PyKDL/kinfam.sip
-+++ b/python_orocos_kdl/PyKDL/kinfam.sip
+--- a/PyKDL/kinfam.sip
++++ b/PyKDL/kinfam.sip
 @@ -344,6 +344,9 @@ public:
      ChainFkSolverPos_recursive(const Chain& chain);
      virtual int JntToCart(const JntArray& q_in, Frame& p_out,int segmentNr=-1);
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
index a1f82a9e03ef..dbb79e0ff7f7 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
 fi
 
-inherit ${SCM} python-r1 cmake-utils
+inherit ${SCM} python-r1 cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
@@ -41,19 +41,19 @@ else
 fi
 
 src_configure() {
-	python_foreach_impl cmake-utils_src_configure
+	python_foreach_impl cmake_src_configure
 }
 
 src_compile() {
-	python_foreach_impl cmake-utils_src_compile
+	python_foreach_impl cmake_src_compile
 }
 
 src_test() {
-	python_foreach_impl cmake-utils_src_test
+	python_foreach_impl cmake_src_test
 }
 
 src_install() {
-	python_foreach_impl cmake-utils_src_install
+	python_foreach_impl cmake_src_install
 
 	# Need to have package.xml in our custom gentoo path
 	insinto /usr/share/ros_packages/${PN}
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 06e204006f9f..228748e30394 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
 fi
 
-inherit ${SCM} python-r1 cmake-utils
+inherit ${SCM} python-r1 cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
@@ -40,19 +40,19 @@ else
 fi
 
 src_configure() {
-	python_foreach_impl cmake-utils_src_configure
+	python_foreach_impl cmake_src_configure
 }
 
 src_compile() {
-	python_foreach_impl cmake-utils_src_compile
+	python_foreach_impl cmake_src_compile
 }
 
 src_test() {
-	python_foreach_impl cmake-utils_src_test
+	python_foreach_impl cmake_src_test
 }
 
 src_install() {
-	python_foreach_impl cmake-utils_src_install
+	python_foreach_impl cmake_src_install
 
 	# Need to have package.xml in our custom gentoo path
 	insinto /usr/share/ros_packages/${PN}
diff --git a/dev-python/rencode/rencode-1.0.6.ebuild b/dev-python/rencode/rencode-1.0.6.ebuild
index 31f20413b8ba..5873bd5409e5 100644
--- a/dev-python/rencode/rencode-1.0.6.ebuild
+++ b/dev-python/rencode/rencode-1.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="similar to bencode from the BitTorrent project"
diff --git a/dev-python/rope/rope-0.17.0.ebuild b/dev-python/rope/rope-0.17.0.ebuild
index 29135b931bc5..1933bb3cbd83 100644
--- a/dev-python/rope/rope-0.17.0.ebuild
+++ b/dev-python/rope/rope-0.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc"
 
diff --git a/dev-python/rospkg/rospkg-1.2.8.ebuild b/dev-python/rospkg/rospkg-1.2.8-r1.ebuild
similarity index 94%
rename from dev-python/rospkg/rospkg-1.2.8.ebuild
rename to dev-python/rospkg/rospkg-1.2.8-r1.ebuild
index 9fe2198838eb..0b443bc38b97 100644
--- a/dev-python/rospkg/rospkg-1.2.8.ebuild
+++ b/dev-python/rospkg/rospkg-1.2.8-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index 9fe2198838eb..0b443bc38b97 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index b46845aae867..68ceaccf3907 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1 +1,2 @@
 DIST Routes-2.4.1.tar.gz 182403 BLAKE2B 21a079616e1533af8fae44b0ad428b3309e5e8d1e27dddddbf3632cb3e1f5286225aec73246012a8c7c22d59d755be27f10fa09ab6ee6b34f71c6c540dfd36e4 SHA512 b0566f10ca83af0459e9c59fa2217bdc5ebf349d944396bcb21ffa731ad189c642e409381979cb5da3153630c24f20aa974a99711f16aca9f91413976af2bb04
+DIST Routes-2.5.1.tar.gz 190905 BLAKE2B e1498d0a26c7ebb1ee423ad211221f648d5bab4d37effac8c34a5f5189558a62c3ab34780f98f6a1620a261efc6085afd54f0827ac0e7a80217de7ae2226580a SHA512 06ec9a8426ced86524096703de47e3da2fa08bd0ed8c962d451b4338966804245b5074077021fb58a5afcb63acd6dcffa05a89703b8b54841a69a4cdff12b755
diff --git a/dev-python/routes/routes-2.5.1.ebuild b/dev-python/routes/routes-2.5.1.ebuild
new file mode 100644
index 000000000000..57fb5a24ebc9
--- /dev/null
+++ b/dev-python/routes/routes-2.5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Routes"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A re-implementation of Rails routes system, mapping URLs to Controllers/Actions"
+HOMEPAGE="https://routes.readthedocs.io/en/latest/ https://pypi.org/project/Routes/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? ( dev-python/webob[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests nose
+distutils_enable_sphinx doc
+
+# The testsuite appears to be held back by the author
+
+# https://github.com/bbangert/routes/issues/42 presents a patch
+# for the faulty docbuild converted to sed stmnts
+python_prepare_all() {
+	# The default theme in sphinx switched to classic from shpinx-1.3.1
+	if has_version ">=dev-python/sphinx-1.3.1"; then
+		sed -e "s:html_theme_options = {:html_theme = 'classic'\n&:" \
+			-i docs/conf.py || die
+	else
+		sed -e "s:html_theme_options = {:html_theme = 'default'\n&:" \
+			-i docs/conf.py || die
+	fi
+	sed -e "s:changes:changes\n   todo:" \
+		-i docs/index.rst || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 7f35a57c39e1..0fabe228d5a4 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -3,3 +3,4 @@ DIST sentry-sdk-0.17.6.tar.gz 183157 BLAKE2B ea0f6af54c31abc785274fc75238a02b8c9
 DIST sentry-sdk-0.17.7.tar.gz 184034 BLAKE2B de71b2e270594abe2e16d7e2fb9db3028e3c2abd4539269562e8786e6d937352153da21d6366d5e0384e3de1dbd6fbabe3d5060a6f0f9953bd260fbd865c893d SHA512 2360321ec0231ba76c968ff4e6dc78d42a48106aa6aade73a1c1194f9406fbafea3b533994da42027b3479302756ed3ec6e44ce551cb01ce60397939beaeb6d4
 DIST sentry-sdk-0.17.8.tar.gz 184271 BLAKE2B d34f881632e66d5db5cad0c6979de6c3c6205119af30b34996122ff7aff1ed7c3dd0c1603e57163f5d72c8525921f9af7c3e1c729adb14b43dbcee0aa4bd9fc5 SHA512 84ae0ca888457ed833b416320c45040e522a656d7c3ca0d64639f179e7be3237f53cfe4827e986a50d37bd7b61da765ed8c00ea663d478874cc47623ccf47a51
 DIST sentry-sdk-0.18.0.tar.gz 186389 BLAKE2B f531d68a1244c34d267cb332263c996afad31f7f72710b868e14850f06de6225a11fc37dca9ff820fc14d2f1b29919cfb10f59b7dc4449c0734458c6bd1b9816 SHA512 4c78418392668b1e061f0d6b88d3cc3511db138a99b08df50d2e610a7d8a5528ad83943ef1cfda8d508cb3b52f511f872ac87439460254a6b28348c9bb92406c
+DIST sentry-sdk-0.19.0.tar.gz 186477 BLAKE2B 67e538526d39f814827f2d53ca2b8f59f1a3f13e3a0622e5a1ae8870c04d320dadac2c93e8afa786b47feb9295e6e50beb831112448ab89a1eaae750895378df SHA512 5bf598af1fd7a565fd20f38a3e4961136fc2d102cdb9810cb43802e696897669ae679d82dec14cef5cdf0d3ee9dc7a3def39457b733b1018dd91f82066e2422f
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.19.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.19.0.ebuild
new file mode 100644
index 000000000000..1e52e8d55106
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-0.19.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		<dev-python/dnspython-2[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/aiocontextvars[${PYTHON_USEDEP}]
+			dev-python/contextvars[${PYTHON_USEDEP}]
+		' python3_6)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		--deselect tests/integrations/stdlib/test_httplib.py
+		--deselect tests/integrations/requests/test_requests.py
+		# wtf is it supposed to do?!
+		--deselect tests/integrations/gcp/test_gcp.py
+		# fails on py3.6, hangs on py3.7+
+		--deselect
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		--deselect
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		--deselect
+		tests/test_client.py::test_databag_depth_stripping
+		--deselect
+		tests/test_client.py::test_databag_string_stripping
+		--deselect
+		tests/test_client.py::test_databag_breadth_stripping
+		# test_filename: apparently unhappy about pytest being called pytest
+		--deselect 'tests/utils/test_general.py::test_filename'
+		# test_circular_references: apparently fragile
+		--deselect
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+	)
+	[[ ${EPYTHON} == python3.6 ]] && deselect+=(
+		# broken with contextvars on py3.6
+		--deselect
+		'tests/utils/test_contextvars.py::test_leaks[greenlet]'
+		--deselect
+		'tests/test_transport.py::test_transport_works[greenlet'
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index 9ae4dbf92750..626ce4bdced0 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -30,7 +30,6 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
-distutils_enable_sphinx doc
 
 python_prepare_all() {
 	# Disable tests hardcoding function call counts specific to Python versions.
diff --git a/dev-python/statsmodels/statsmodels-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
index cb0c73adee24..18951d2f5133 100644
--- a/dev-python/statsmodels/statsmodels-0.12.0.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/testfixtures/testfixtures-6.14.2.ebuild b/dev-python/testfixtures/testfixtures-6.14.2.ebuild
index e5277b293383..1c445c878270 100644
--- a/dev-python/testfixtures/testfixtures-6.14.2.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 9d2e25fabe2f..9f399a9f3e4b 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1 +1 @@
-DIST tikzplotlib-0.9.1.tar.gz 584961 BLAKE2B 62737db9117c96484de690b26c3f13d5a872a3c70ad4ebe635bcba348dfa7f0eb944b8c469807c4c474351a9fae7db6dd71df82e33ee33cbdd8b1abeb9686e1b SHA512 10f3be8b843ea81d48bd6fad494a7e7a0cc5afd45a96c26be7f4dfbac929bdb3010fd355c6e1ef262273fd0783fc5b5b4a7b41a0c01e18cff5446bb9d96ee2b7
+DIST tikzplotlib-0.9.4.tar.gz 588518 BLAKE2B 3f6ec8b9149ef86e8a0dd551d4aeca4f676df3ca86de8bb9bfbf2abed81afab50adef99752970a40f174258f4d14c245366c5159f241d2cd10f7cebdfd6bbbfb SHA512 0d654dbecc473f5bc20dc128ad55852c3787ddd50cf730ed57b25a25e6a55e79bfd451eb28188d75ac6b61a53a6a6e244bef2ca366dcb636e0d325c74b32d1cd
diff --git a/dev-python/tikzplotlib/metadata.xml b/dev-python/tikzplotlib/metadata.xml
index 50a33145b076..34881f6ec28c 100644
--- a/dev-python/tikzplotlib/metadata.xml
+++ b/dev-python/tikzplotlib/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>tikzplotlib is a Python tool for converting matplotlib figures into PGFPlots (TikZ) figures like for native inclusion into LaTeX documents. The output of tikzplotlib is in PGFPlots, a LaTeX library that sits on top of TikZ and describes graphs in terms of axes, data etc. Consequently, the output of tikzplotlib retains more information, can be more easily understood, and is more easily editable than raw TikZ output.</longdescription>
 	<upstream>
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
deleted file mode 100644
index d079411a0592..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/tikzplotlib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_prepare_all() {
-	# this test fails: tikz error
-	# cannot mix dimensions and dimensionless values in an ellipse
-	rm test/test_patches.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	virtx pytest -vv
-}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.4.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.4.ebuild
new file mode 100644
index 000000000000..c6df920586bc
--- /dev/null
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
+HOMEPAGE="https://github.com/nschloe/tikzplotlib"
+SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-text/texlive[extra]
+	$( python_gen_cond_dep \
+		'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 )
+	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/wheel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/exdown[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/mock
+
+python_prepare_all() {
+	# setup.py was removed in commit f04323cfa575caf8a25a9236f55fe6baf1a33b20
+	# for some reason, DISTUTULS_USE_SETUPTOOLS="pyproject.toml" is not working
+	# it complains about file not found, setup.cfg does exist
+
+	cat > setup.py <<EOF || die
+from setuptools import setup
+
+if __name__ == "__main__":
+	setup()
+EOF
+
+	# Lots of TeX errors
+	rm test/test_patches.py || die
+	rm test/test_context.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x MPLBACKEND=Agg
+	virtx pytest -vv
+}
diff --git a/dev-python/ujson/ujson-1.35-r1.ebuild b/dev-python/ujson/ujson-1.35-r1.ebuild
index c729688ffb8a..1bb4b6451ebd 100644
--- a/dev-python/ujson/ujson-1.35-r1.ebuild
+++ b/dev-python/ujson/ujson-1.35-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ujson/ujson-3.2.0.ebuild b/dev-python/ujson/ujson-3.2.0.ebuild
index 580474477867..dacad4fa08c6 100644
--- a/dev-python/ujson/ujson-3.2.0.ebuild
+++ b/dev-python/ujson/ujson-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
index 7f34fdbdb84f..285139190e8f 100644
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 WX_GTK_VER="3.0-gtk3"
 
 inherit distutils-r1 multiprocessing virtualx wxwidgets
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index fc2fb0e0b418..136ba777f9fd 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -2,3 +2,4 @@ DIST xlsxwriter-1.3.3-tests.tar.gz 32108929 BLAKE2B faabdf2d2662c61217925679b1b2
 DIST xlsxwriter-1.3.4-tests.tar.gz 32300247 BLAKE2B ef388172c09f258f0c70a45545fae068359ed182693cf5bf04f2d4f6b528a08e5f963766a5b553c70c94b6e7f7e7a45b3d0dd6e6754dec320bf4748a309c2402 SHA512 12bacc4e604f02f2045e1e5e5f402dcb96a04e1fbd8d934d19eefc01d011832586a517e235c99793a4114d64940785ab02586d40b3bf089b455b681268ee4ef6
 DIST xlsxwriter-1.3.5-tests.tar.gz 32306484 BLAKE2B 161eed08d54ffb1728dfef394abd7614d2ec9e275b93079434bd3bd125e5707b15a6ca164a835ddec31894caa83d68dbd8d3cc5f38d24e4e30b2d86bd7f3e240 SHA512 349c7635f6d770ecd3429012c3e3a91f78381427fa166ef29da7cd7fd86e89da82dd51ddd69dca7b9ae4fb4f05ea4213c47c161755ed9a55a83b6b971edf8202
 DIST xlsxwriter-1.3.6-tests.tar.gz 32500145 BLAKE2B 796cc49f26ffbb6f980488b2fb184da95a4d95049544e30d6754823cdac9f98cc829cd665c293220033b9e654ce95816b668ad364796b4b19a47e0fb6ac03fb9 SHA512 5a8031a92e467f1afef4a2bdcde199f35bf3a013cfe01b28cf182c9c6f51f46f51547c73165e05094f0bfbdab6b2e8f96ff75e531fe63681ce72cf93325c098d
+DIST xlsxwriter-1.3.7-tests.tar.gz 32545996 BLAKE2B 789ee62a955422629f5a1ab80924774a98c34b2276f9fbc865d6a9d0e31778a49c5b4be72b3f7db55a13ff1d265514bd1dfaadb9243b21faa8ed2740db60ebd7 SHA512 516be34f5f5fd64835a4015c6eb23c23e8aabb34adc189a50f6ff4afe5cb31f01282870ce037679d14e0c40757f1ed51d26b4cb8fecdf952b4c38b6638d1d72f
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.3.7.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.3.7.ebuild
new file mode 100644
index 000000000000..0976f9f9d2f1
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.3.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="XlsxWriter"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.tar.gz -> ${P}-tests.tar.gz"
+S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/yapf/yapf-0.30.0.ebuild b/dev-python/yapf/yapf-0.30.0.ebuild
index ca683033d50a..aecfe3d88978 100644
--- a/dev-python/yapf/yapf-0.30.0.ebuild
+++ b/dev-python/yapf/yapf-0.30.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index f875628cf5ab..c77f52835221 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/assistant/assistant-5.15.1.ebuild b/dev-qt/assistant/assistant-5.15.1.ebuild
index c74b1a6b063f..584fc36faa93 100644
--- a/dev-qt/assistant/assistant-5.15.1.ebuild
+++ b/dev-qt/assistant/assistant-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc ~x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/designer-5.15.1.ebuild b/dev-qt/designer/designer-5.15.1.ebuild
index fae33199ddff..57a5d01a79ba 100644
--- a/dev-qt/designer/designer-5.15.1.ebuild
+++ b/dev-qt/designer/designer-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~x86"
 fi
 
 IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.1.ebuild
index 8205d0b431c8..c2fe3615e17c 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.1.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/linguist-5.15.1.ebuild b/dev-qt/linguist/linguist-5.15.1.ebuild
index 7c95263bfc75..42b3f00b2294 100644
--- a/dev-qt/linguist/linguist-5.15.1.ebuild
+++ b/dev-qt/linguist/linguist-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.15.1.ebuild b/dev-qt/pixeltool/pixeltool-5.15.1.ebuild
index 06e0d92df614..a9e60f8795a0 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/qdbus-5.15.1.ebuild b/dev-qt/qdbus/qdbus-5.15.1.ebuild
index 3ad7453b70a0..906f1b9981e5 100644
--- a/dev-qt/qdbus/qdbus-5.15.1.ebuild
+++ b/dev-qt/qdbus/qdbus-5.15.1.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.15.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.1.ebuild
index b6e5a6a35264..7ad1503a9638 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.1.ebuild
index 05b3c1cdf805..6aca9d5e10b8 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.1.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild
index 7fb2a6fe16a0..baa7856b71ad 100644
--- a/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/$(ver_cut 1-3)
 
 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="icu old-kernel systemd"
diff --git a/dev-qt/qtcore/qtcore-5.15.1.ebuild b/dev-qt/qtcore/qtcore-5.15.1.ebuild
deleted file mode 100644
index 449fddfc065d..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/$(ver_cut 1-3)
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
-	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:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtdbus/qtdbus-5.15.1.ebuild b/dev-qt/qtdbus/qtdbus-5.15.1.ebuild
index 532209a78909..00a3c7b69acc 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.1.ebuild
index 30f4795bcc5f..9238716e434b 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.1.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 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.ebuild
index 5d4af49d2118..db46772b4ddb 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.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.15.1-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.1-r1.ebuild
index ffc047451f02..8dd5a9853342 100644
--- a/dev-qt/qtgui/qtgui-5.15.1-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.1-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 707658
 
 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: linuxfb
diff --git a/dev-qt/qthelp/qthelp-5.15.1.ebuild b/dev-qt/qthelp/qthelp-5.15.1.ebuild
index 8effe7708292..e5c47e6f0864 100644
--- a/dev-qt/qthelp/qthelp-5.15.1.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.1.ebuild
index 8a8e45b42c76..a75a921033b2 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.1.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="mng"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild
index 6f6fbab5aebf..6b804f1d7e94 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.1.ebuild
index 6bea7f756e45..8f119d23aff1 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="bindist connman gssapi libressl libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtopengl/qtopengl-5.15.1.ebuild b/dev-qt/qtopengl/qtopengl-5.15.1.ebuild
index 0ab87333edf3..dab8072a8e11 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.1.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="gles2-only"
diff --git a/dev-qt/qtpaths/qtpaths-5.15.1.ebuild b/dev-qt/qtpaths/qtpaths-5.15.1.ebuild
index 7462fb62a88f..5a2dfe6b1a76 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.1.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.1.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.15.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild
index fd62a7dd19da..2f2482d52d80 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.15.1.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.15.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.1.ebuild
index a53bde9a53db..4379e86c27bb 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="cups gles2-only"
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.1.ebuild
index f576b58f0a5a..96b9f35c2c5a 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.1.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.1.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/qtscript/qtscript-5.15.1.ebuild b/dev-qt/qtscript/qtscript-5.15.1.ebuild
index de9c46b89fa6..9f19eea4e5ec 100644
--- a/dev-qt/qtscript/qtscript-5.15.1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.15.1.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"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtsensors/qtsensors-5.15.1.ebuild b/dev-qt/qtsensors/qtsensors-5.15.1.ebuild
index a8f351e51224..64771d6be2fe 100644
--- a/dev-qt/qtsensors/qtsensors-5.15.1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.15.1.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.15.1.ebuild b/dev-qt/qtserialport/qtserialport-5.15.1.ebuild
index b52482cd8150..5b23f0ad73b9 100644
--- a/dev-qt/qtserialport/qtserialport-5.15.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.15.1.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/qtsql/qtsql-5.15.1.ebuild b/dev-qt/qtsql/qtsql-5.15.1.ebuild
index c20f8a2f5be3..864ff364e2c8 100644
--- a/dev-qt/qtsql/qtsql-5.15.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/qtsvg-5.15.1.ebuild b/dev-qt/qtsvg/qtsvg-5.15.1.ebuild
index edd406f8938b..0e0632d88105 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/qttest-5.15.1.ebuild b/dev-qt/qttest/qttest-5.15.1.ebuild
index 88d7585b5ce8..c3bd071af649 100644
--- a/dev-qt/qttest/qttest-5.15.1.ebuild
+++ b/dev-qt/qttest/qttest-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.15.1.ebuild b/dev-qt/qttranslations/qttranslations-5.15.1.ebuild
index 683b6eb2279f..325065d5d7ae 100644
--- a/dev-qt/qttranslations/qttranslations-5.15.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtwayland/qtwayland-5.15.1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.1.ebuild
index 8370d46f31c4..03543b699d46 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.1.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 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="vulkan X"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.1.ebuild
index 7708317f85eb..d6669e5de5b2 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.1.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/qtwebsockets/qtwebsockets-5.15.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.1.ebuild
index ae32bef51176..d9c375383f56 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.1.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.15.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
index 6d11e9af90c7..f43f1204a087 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
@@ -9,7 +9,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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.1.ebuild
index d3660678e297..542b0c10b3dc 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.15.1.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.15.1.ebuild
@@ -8,7 +8,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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.15.1.ebuild b/dev-qt/qtxml/qtxml-5.15.1.ebuild
index 9ce3778a98d5..76481207ab31 100644
--- a/dev-qt/qtxml/qtxml-5.15.1.ebuild
+++ b/dev-qt/qtxml/qtxml-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.1.ebuild
index 123156ec7d77..8133cada3102 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.1.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"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="qml"
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 3fe758d82111..b3253acf7955 100644
Binary files a/dev-ros/Manifest.gz and b/dev-ros/Manifest.gz differ
diff --git a/dev-ros/console_bridge_vendor/Manifest b/dev-ros/console_bridge_vendor/Manifest
index 4a8b2afeaf1d..8e1e1146e32f 100644
--- a/dev-ros/console_bridge_vendor/Manifest
+++ b/dev-ros/console_bridge_vendor/Manifest
@@ -1 +1 @@
-DIST console_bridge_vendor-1.2.1.tar.gz 7403 BLAKE2B d18f2ccb352c04b1c84a2c8ed5bb4fb790cddd3adf9667a6e9e99cdfb7da3f24931c653ffd0c8175131799d08086d110ad9ad33660ffc307a3a21a7dbf54ebef SHA512 12b611ff578b4a9e20fc894789985056b1b396f7085d4d6f0848fbe1a926ddc47ee6cc2c65bf3289041573b48bad75e2ce5a6d1b3f94aa8049429faece44d6a2
+DIST console_bridge_vendor-1.2.2.tar.gz 7570 BLAKE2B 2b690d20851cf38554fcfa8645eb0c8bd7b226dcdf1e43ac379f5164d1aa8133bd4e75654b3354153985015d46a7cb2b71195cf123a982eadd1a91bbf6172624 SHA512 e44090cec050af7681892bfc4cb71d7f127b467845a1ec0d103678322c9482ce6ede0b5e914fd472380381906e350b3f64ead4d67e4c514a3c7c7e4d6fc24c22
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild
similarity index 100%
rename from dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild
rename to dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.2.ebuild
diff --git a/dev-ros/filters/Manifest b/dev-ros/filters/Manifest
index 862155312fe4..80cfa9540608 100644
--- a/dev-ros/filters/Manifest
+++ b/dev-ros/filters/Manifest
@@ -1 +1 @@
-DIST filters-1.9.0.tar.gz 18865 BLAKE2B 0ef5508cbd32d2af42c38655aef0075b0d16339c4264bac6b3356b96a08b1344a4002c60c9c57af61846615ed28bfbfcd8cff74677e0f70e78778b3cc643c7bc SHA512 df1823a2a2a3e49bdc6c22c7bacfe696bed4eb9fa1f1339854e47e6b2757c8d7a8256c3bbf83154d22f47ae6d79af4a2fc4b878b83ad6eb9445072481326b3d3
+DIST filters-1.9.1.tar.gz 19633 BLAKE2B 1ce27734145e04546d90cd802721aa5b8003b366227161e64451d7ac656628d0178b3ea5cab5f9ca5b054bc81ff5cefd00beaeea855c5c6507ecabc40bc27985 SHA512 ed66211b6e66d7c303a72bce4b9b06abd29d9101ae46b9bd4cb5dee26867d7d7e8b9bfcc6feffc83ac15a4780e62577665e9ce9881f836931f361258a12cf127
diff --git a/dev-ros/filters/filters-1.9.0.ebuild b/dev-ros/filters/filters-1.9.1.ebuild
similarity index 100%
rename from dev-ros/filters/filters-1.9.0.ebuild
rename to dev-ros/filters/filters-1.9.1.ebuild
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index 5fe9a51b138d..ef9f3f5f91eb 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1 +1 @@
-DIST geometric_shapes-0.7.0.tar.gz 84518 BLAKE2B 948f84959c526f6155bc9769a264cc631e04171ee22bedb435667668c621c3ca2d983d7b2b964690735b3b48b8ed71058c32aefc67d6370da3cc0528ed448f3e SHA512 9f5886841dfc23db40e68d69a386879ec0b93c03faea6f2e6e33d92b303c314fbba6cfdf548e6236424d5d0131209824e0a8bc116bd64015688c2fd477eb44f0
+DIST geometric_shapes-0.7.2.tar.gz 84443 BLAKE2B bcfcfeb08cbd60c889a2a801855eddd85a3ac42752991c0721ea0aee19a5650493e390d80a8ed99610a40efb5ca1fe0c1a49329471368b335483f8ceb193ca8a SHA512 5c1a05c0166c32c0d5ac9d22dd6feb784845342d7cde8d642731a08aafa54ed0b1545864f42b7de7641031bf7f0e353a632404799051770d55c7855b57d78027
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild
similarity index 100%
rename from dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild
rename to dev-ros/geometric_shapes/geometric_shapes-0.7.2.ebuild
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index 66ac5ab4477a..a4cbf1623ad5 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -1 +1,2 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
diff --git a/dev-ros/libmavconn/libmavconn-1.4.0.ebuild b/dev-ros/libmavconn/libmavconn-1.4.0.ebuild
new file mode 100644
index 000000000000..9a943481d549
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-1.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-ros/mavlink-gbp-release-2016.7.7
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
index 58eba31902e6..b82b965fceaf 100644
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@@ -1 +1 @@
-DIST mavlink-gbp-release-2020.7.7.tar.gz 4130271 BLAKE2B e9e6759da3734fe918e1c9441ca823a62d8629f08e3b049a1817103ddd7dca14098f69842b4d38f3fda991f7c9020e9cde84315eb1c8b47ae9785c7c26957420 SHA512 bd23f9f4cfba941ef928e79d5c26d6c310189eefbd1c29f019b688c5d2a07cccf1bcf6212d516cccff28fdcfbc3cff0f585eb5e7640fc011eab252e0222cee46
+DIST mavlink-gbp-release-2020.9.10.tar.gz 4134330 BLAKE2B a8b2ad07ebf67bf19b37d6fefd6e41a5d6c95e9eaac413785943bd88e63f1a8acf4a4ea7d7ecd680e5ff306d46235a8cf0239af724d01d960c96cd8623818a22 SHA512 9c3429b16b0bcd364d89db3817cab76545f799407095cd6d7af5fff552aa4a4314645b6db517389bcdb511e009b4bfce5d62ae6b4aec7b0542bdc892cdf1ebb9
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7-r1.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild
similarity index 100%
rename from dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7-r1.ebuild
rename to dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.9.10.ebuild
diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest
index 66ac5ab4477a..a4cbf1623ad5 100644
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@@ -1 +1,2 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
diff --git a/dev-ros/mavros/mavros-1.4.0.ebuild b/dev-ros/mavros/mavros-1.4.0.ebuild
new file mode 100644
index 000000000000..12562bf79410
--- /dev/null
+++ b/dev-ros/mavros/mavros-1.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	dev-ros/roscpp
+	dev-ros/tf
+	dev-ros/angles
+	dev-ros/libmavconn
+	dev-ros/rosconsole_bridge
+	dev-libs/boost:=
+	dev-ros/eigen_conversions
+	sci-geosciences/GeographicLib
+	>=dev-ros/mavlink-gbp-release-2020.9.10
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	>=dev-ros/mavros_msgs-${PV}[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/mavros/mavros-9999.ebuild b/dev-ros/mavros/mavros-9999.ebuild
index 74118adcd502..12562bf79410 100644
--- a/dev-ros/mavros/mavros-9999.ebuild
+++ b/dev-ros/mavros/mavros-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-ros/eigen_conversions
 	sci-geosciences/GeographicLib
-	>=dev-ros/mavlink-gbp-release-2016.11.11
+	>=dev-ros/mavlink-gbp-release-2020.9.10
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
index 66ac5ab4477a..a4cbf1623ad5 100644
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@@ -1 +1,2 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
diff --git a/dev-ros/mavros_extras/mavros_extras-1.4.0.ebuild b/dev-ros/mavros_extras/mavros_extras-1.4.0.ebuild
new file mode 100644
index 000000000000..e7290bdf87be
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-1.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/urdf
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/mavros_msgs/Manifest b/dev-ros/mavros_msgs/Manifest
index 66ac5ab4477a..a4cbf1623ad5 100644
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@@ -1 +1,2 @@
 DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+DIST mavros-1.4.0.tar.gz 316881 BLAKE2B 2f7d401024fb8ce08a91e70b175bfacfcd6ec28ae8bd744ed4fba20c8a8362eaed71143c3fa34b53084d92ed5bccda3b291bc08f310f7a1c48fb25f608709c48 SHA512 d09c328d9878ada83c2c34cd44b582085e2ca5770ce78b6a52d27545333d43d5f7f92be14e3636db5ecee8d8d9e95134693ec8d4676adee5e1307ac958f182b6
diff --git a/dev-ros/mavros_msgs/mavros_msgs-1.4.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.4.0.ebuild
new file mode 100644
index 000000000000..04710e1afb12
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-1.4.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geographic_msgs dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/moveit_msgs/Manifest b/dev-ros/moveit_msgs/Manifest
index f89926760020..1036c4781989 100644
--- a/dev-ros/moveit_msgs/Manifest
+++ b/dev-ros/moveit_msgs/Manifest
@@ -1 +1 @@
-DIST moveit_msgs-0.10.1.tar.gz 19163 BLAKE2B b24b9b0330350c42c80588f6bd9273ba467958812f294918f7a4695ef435b6105591aab01f856c008ac0d73679d5bab34249f82b723de954fd66ac461ee9bbb6 SHA512 7b574bcffc7533dba44420b5a965604bc8396cfac7d1d3f3dc8e0ecb8f65c4a7b4692c06286db80ee3e3cf995c79dc52297aa9cd5237a0d87613266f762cb2dd
+DIST moveit_msgs-0.11.1.tar.gz 20617 BLAKE2B 12b6f6f606d5f3ecaee8bafc5703526020ef60b421e452bb603390236caede4e7fb0d1310d0fc5c38dd63676085a083a76721f97a3548022375b3b2a8b72596c SHA512 b9f99bbae3d13040368ab8fb649682becd194ff91279c7c5a3060104789df91a4d61334a369a46e9d161f9f7386d42b97a189451c2ac0b5f124fb17df92ca680
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.10.1.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.11.1.ebuild
similarity index 100%
rename from dev-ros/moveit_msgs/moveit_msgs-0.10.1.ebuild
rename to dev-ros/moveit_msgs/moveit_msgs-0.11.1.ebuild
diff --git a/dev-ros/object_recognition_msgs/Manifest b/dev-ros/object_recognition_msgs/Manifest
index c2522ddb1023..c75baaced7db 100644
--- a/dev-ros/object_recognition_msgs/Manifest
+++ b/dev-ros/object_recognition_msgs/Manifest
@@ -1 +1 @@
-DIST object_recognition_msgs-0.4.1.tar.gz 4756 BLAKE2B 9d6c919b82d4e9300eebc9ba36498414f62a9a6392649adb7db011e315eb64d2810b1c8eab6f647a58d8ab60dfa1dfae77d98164b9f97d9f4a9c47716a0d3cc4 SHA512 4e2d48795b0376640dbb6eb82ca3d0cdf5e2d4a2e7ec8d723ce7613c678fc2dc037fceafe8b37a905d9bb2f0a283e84e4adbf986dd6e5322ae96d43de120a3cf
+DIST object_recognition_msgs-0.4.2.tar.gz 4810 BLAKE2B 004087f2f7982b2cffca52023061a5f05830fb2e10e4d62683ca171f3c36926c912d9c6e07ab5ae2a694a07fe2a3d8dac040d8f0c3abb9640e8c07462084c416 SHA512 20a2e1d05f5610c0102340a6f6fe725d47134bf6a69e018a607dde68a2d980455fc0b7d848202259801cfd7d9671a80a3f4f1bd3f571df73240e4885f5eb9d34
diff --git a/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild b/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.2.ebuild
similarity index 100%
rename from dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
rename to dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.2.ebuild
diff --git a/dev-ros/qt_gui_cpp/Manifest b/dev-ros/qt_gui_cpp/Manifest
index a69b42f56b27..39d59701806a 100644
--- a/dev-ros/qt_gui_cpp/Manifest
+++ b/dev-ros/qt_gui_cpp/Manifest
@@ -1,2 +1 @@
-DIST qt_gui_core-0.4.1.tar.gz 96850 BLAKE2B a8a4325d5462a0788a69661adb20b3bf1bc9e391344ced31468bf9ddbe7114a13a2ecd3dda580986bd0af98c837641bda3e3d6cd3c5d9fa3352c37817ace2ed4 SHA512 0c46f86f88a818107049d08db6682a320f47b1b4983c586e4c944a387c070c7e017fca2f4be9d251f8a907f15be439998b2d559bea51ffc724fa4afc5e75f67c
 DIST qt_gui_core-0.4.2.tar.gz 97267 BLAKE2B 631996dd5b2a4e0aa557eb14a9dcb967377fce4923ada280d5894a733827f6f7d1aa240cc28261ee95a39171b03cba4f27f794ca3f9eb488d8b1953d237a9223 SHA512 a8b684d52eb1d4bfcdb6b63a989598d2098462d6fd93f26dd5a7eb0c0c9be9c324cb5d77b5e12c583253da4ce5edc544535bb9dd5a2f7966bf1642a7bd0ca421
diff --git a/dev-ros/qt_gui_cpp/files/rpaths.patch b/dev-ros/qt_gui_cpp/files/rpaths.patch
new file mode 100644
index 000000000000..313e3edcb72a
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/files/rpaths.patch
@@ -0,0 +1,15 @@
+Index: qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
+===================================================================
+--- qt_gui_cpp.orig/src/qt_gui_cpp_sip/CMakeLists.txt
++++ qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
+@@ -29,8 +29,8 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
+ # maintain context for different named target
+ set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include" ${catkin_INCLUDE_DIRS})
+ set(qt_gui_cpp_sip_LIBRARIES ${qt_gui_cpp_LIBRARIES} ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
+-set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+-set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
++set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS})
++set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER} -L${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+ 
+ find_package(python_qt_binding REQUIRED)
+ include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake)
diff --git a/dev-ros/qt_gui_cpp/files/sip.patch b/dev-ros/qt_gui_cpp/files/sip.patch
deleted file mode 100644
index 8157a9bc68d7..000000000000
--- a/dev-ros/qt_gui_cpp/files/sip.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5ecb3a219146816916c4a94e32664850548a2085 Mon Sep 17 00:00:00 2001
-From: Johannes Meyer <johannes@intermodalics.eu>
-Date: Tue, 7 Jul 2020 01:20:51 +0200
-Subject: [PATCH] qt_gui_cpp_sip: declare private assignment operator for SIP
- (#226)
-
----
- qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip b/qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip
-index 286d52e6..1d37a37d 100644
---- a/src/qt_gui_cpp_sip/plugin_context.sip
-+++ b/src/qt_gui_cpp_sip/plugin_context.sip
-@@ -25,6 +25,10 @@ public:
- 
-   void reloadPlugin();
- 
-+private:
-+
-+  PluginContext& operator=(const PluginContext&);
-+
- };
- 
- };
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild
deleted file mode 100644
index c4d73b4fc0d7..000000000000
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++-bindings for qt_gui and creates bindings for every generator available"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	>=dev-ros/pluginlib-1.9.23
-		dev-libs/tinyxml2:=
-	>=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/tinyxml
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/libdir.patch"
-	"${FILESDIR}/sip.patch"
-)
-
-# FIXME: fails to build with ninja
-CMAKE_MAKEFILE_GENERATOR=emake
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild
similarity index 96%
rename from dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild
rename to dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild
index 1f52f6afc836..dac9e5563d61 100644
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 "
 PATCHES=(
 	"${FILESDIR}/libdir.patch"
+	"${FILESDIR}/rpaths.patch"
 )
 
 # FIXME: fails to build with ninja
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
index 1f52f6afc836..dac9e5563d61 100644
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 "
 PATCHES=(
 	"${FILESDIR}/libdir.patch"
+	"${FILESDIR}/rpaths.patch"
 )
 
 # FIXME: fails to build with ninja
diff --git a/dev-ros/ros_environment/Manifest b/dev-ros/ros_environment/Manifest
index d0838219ff69..5551d1750012 100644
--- a/dev-ros/ros_environment/Manifest
+++ b/dev-ros/ros_environment/Manifest
@@ -1 +1 @@
-DIST ros_environment-1.3.1.tar.gz 6533 BLAKE2B 50b6b24af91c5d96097873c3a05f258b2737053594a888ac5677147160708e192e1662558f33537b9510d206d5f00374ba3bec3b3491e5f51cfac3bcec842c1f SHA512 f47b9a7801ea4aa841b5127714e099c83e60fb42e8eedb726a4d3b23fcfb93c25c6f9bdc042a449399333c3165db1a72b9ebb25424981fe43bcfa5445f4678c5
+DIST ros_environment-1.3.2.tar.gz 6418 BLAKE2B d08308c966e95e2bf9a043d52b4f3c787c89b39ce30b038daae7907aa9493ab0478c898da84673099485f08c5b5d811dfc84af3bb714766fb5ff4ab95a17b1ed SHA512 4fff1bfba0af47aaf0fa2e571f61e559952432da77b5c453153b357e22fc9148d72bad4772bf3def0f754e86794c0246662c384ec75b7d89b6ebac4ad8baf808
diff --git a/dev-ros/ros_environment/ros_environment-1.3.1.ebuild b/dev-ros/ros_environment/ros_environment-1.3.2.ebuild
similarity index 100%
rename from dev-ros/ros_environment/ros_environment-1.3.1.ebuild
rename to dev-ros/ros_environment/ros_environment-1.3.2.ebuild
diff --git a/dev-ros/rosserial_arduino/Manifest b/dev-ros/rosserial_arduino/Manifest
index 7642ef7cb1e1..b7fd4069d988 100644
--- a/dev-ros/rosserial_arduino/Manifest
+++ b/dev-ros/rosserial_arduino/Manifest
@@ -1 +1,2 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.9.1.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.9.1.ebuild
new file mode 100644
index 000000000000..f444499009fb
--- /dev/null
+++ b/dev-ros/rosserial_arduino/rosserial_arduino-0.9.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/Manifest b/dev-ros/rosserial_client/Manifest
index 7642ef7cb1e1..b7fd4069d988 100644
--- a/dev-ros/rosserial_client/Manifest
+++ b/dev-ros/rosserial_client/Manifest
@@ -1 +1,2 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
diff --git a/dev-ros/rosserial_client/rosserial_client-0.9.1.ebuild b/dev-ros/rosserial_client/rosserial_client-0.9.1.ebuild
new file mode 100644
index 000000000000..6dab12d86ad4
--- /dev/null
+++ b/dev-ros/rosserial_client/rosserial_client-0.9.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generalized client side source for rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/Manifest b/dev-ros/rosserial_embeddedlinux/Manifest
index 7642ef7cb1e1..b7fd4069d988 100644
--- a/dev-ros/rosserial_embeddedlinux/Manifest
+++ b/dev-ros/rosserial_embeddedlinux/Manifest
@@ -1 +1,2 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.1.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.1.ebuild
new file mode 100644
index 000000000000..49525af06d65
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.9.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/Manifest b/dev-ros/rosserial_msgs/Manifest
index 7642ef7cb1e1..b7fd4069d988 100644
--- a/dev-ros/rosserial_msgs/Manifest
+++ b/dev-ros/rosserial_msgs/Manifest
@@ -1 +1,2 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-0.9.1.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.9.1.ebuild
new file mode 100644
index 000000000000..711a0ec3fdf5
--- /dev/null
+++ b/dev-ros/rosserial_msgs/rosserial_msgs-0.9.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for automatic topic configuration using rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/Manifest b/dev-ros/rosserial_python/Manifest
index 7642ef7cb1e1..b7fd4069d988 100644
--- a/dev-ros/rosserial_python/Manifest
+++ b/dev-ros/rosserial_python/Manifest
@@ -1 +1,2 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
diff --git a/dev-ros/rosserial_python/rosserial_python-0.9.1.ebuild b/dev-ros/rosserial_python/rosserial_python-0.9.1.ebuild
new file mode 100644
index 000000000000..2051b6c0c412
--- /dev/null
+++ b/dev-ros/rosserial_python/rosserial_python-0.9.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A Python-based implementation of the ROS serial protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest
index 7642ef7cb1e1..cb185c6583e7 100644
--- a/dev-ros/rosserial_server/Manifest
+++ b/dev-ros/rosserial_server/Manifest
@@ -1 +1 @@
-DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
diff --git a/dev-ros/rosserial_server/files/boost170.patch b/dev-ros/rosserial_server/files/boost170.patch
deleted file mode 100644
index cbf106fc9acd..000000000000
--- a/dev-ros/rosserial_server/files/boost170.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: rosserial_server/include/rosserial_server/async_read_buffer.h
-===================================================================
---- rosserial_server.orig/include/rosserial_server/async_read_buffer.h
-+++ rosserial_server/include/rosserial_server/async_read_buffer.h
-@@ -166,7 +166,7 @@ private:
- 
-     // Post the callback rather than executing it here so, so that we have a chance to do the cleanup
-     // below prior to it actually getting run, in the event that the callback queues up another read.
--    stream_.get_io_service().post(boost::bind(read_success_callback_, stream));
-+    static_cast<boost::asio::io_service&>(stream_.get_executor().context()).post(boost::bind(read_success_callback_, stream));
- 
-     // Resetting these values clears our state so that we know there isn't a callback pending.
-     read_requested_bytes_ = 0;
-Index: rosserial_server/include/rosserial_server/udp_stream.h
-===================================================================
---- rosserial_server.orig/include/rosserial_server/udp_stream.h
-+++ rosserial_server/include/rosserial_server/udp_stream.h
-@@ -48,7 +48,6 @@ namespace rosserial_server
- {
- 
- using boost::asio::ip::udp;
--using boost::asio::handler_type;
- 
- 
- class UdpStream : public udp::socket
-@@ -62,9 +61,9 @@ public:
-   {
-     boost::system::error_code ec;
-     const protocol_type protocol = server_endpoint.protocol();
--    this->get_service().open(this->get_implementation(), protocol, ec);
-+    udp::socket::open(protocol, ec);
-     boost::asio::detail::throw_error(ec, "open");
--    this->get_service().bind(this->get_implementation(), server_endpoint, ec);
-+    bind(server_endpoint, ec);
-     boost::asio::detail::throw_error(ec, "bind");
- 
-     client_endpoint_ = client_endpoint;
-@@ -76,6 +75,8 @@ public:
-   async_write_some(const ConstBufferSequence& buffers,
-       BOOST_ASIO_MOVE_ARG(WriteHandler) handler)
-   {
-+    return async_send(buffers, handler);
-+#if 0
-     // If you get an error on the following line it means that your handler does
-     // not meet the documented type requirements for a WriteHandler.
-     BOOST_ASIO_WRITE_HANDLER_CHECK(WriteHandler, handler) type_check;
-@@ -94,6 +95,7 @@ public:
-         this->get_implementation(), buffers, client_endpoint_, 0,
-         BOOST_ASIO_MOVE_CAST(WriteHandler)(handler));
- #endif
-+#endif
-   }
- 
-   template <typename MutableBufferSequence, typename ReadHandler>
-@@ -102,6 +104,8 @@ public:
-   async_read_some(const MutableBufferSequence& buffers,
-       BOOST_ASIO_MOVE_ARG(ReadHandler) handler)
-   {
-+    return async_receive(buffers, handler);
-+#if 0
-     // If you get an error on the following line it means that your handler does
-     // not meet the documented type requirements for a ReadHandler.
-     BOOST_ASIO_READ_HANDLER_CHECK(ReadHandler, handler) type_check;
-@@ -119,6 +123,7 @@ public:
-         this->get_implementation(), buffers, client_endpoint_, 0,
-         BOOST_ASIO_MOVE_CAST(ReadHandler)(handler));
- #endif
-+#endif
-   }
- 
- private:
diff --git a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild b/dev-ros/rosserial_server/rosserial_server-0.9.1.ebuild
similarity index 92%
rename from dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
rename to dev-ros/rosserial_server/rosserial_server-0.9.1.ebuild
index c3d3ee32e16b..dff517382a90 100644
--- a/dev-ros/rosserial_server/rosserial_server-0.8.0.ebuild
+++ b/dev-ros/rosserial_server/rosserial_server-0.9.1.ebuild
@@ -21,4 +21,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/rosserial_server/rosserial_server-9999.ebuild b/dev-ros/rosserial_server/rosserial_server-9999.ebuild
index c3d3ee32e16b..dff517382a90 100644
--- a/dev-ros/rosserial_server/rosserial_server-9999.ebuild
+++ b/dev-ros/rosserial_server/rosserial_server-9999.ebuild
@@ -21,4 +21,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/rosserial_tivac/Manifest b/dev-ros/rosserial_tivac/Manifest
index 7642ef7cb1e1..b7fd4069d988 100644
--- a/dev-ros/rosserial_tivac/Manifest
+++ b/dev-ros/rosserial_tivac/Manifest
@@ -1 +1,2 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
diff --git a/dev-ros/rosserial_tivac/rosserial_tivac-0.9.1.ebuild b/dev-ros/rosserial_tivac/rosserial_tivac-0.9.1.ebuild
new file mode 100644
index 000000000000..b486bb20bc3c
--- /dev/null
+++ b/dev-ros/rosserial_tivac/rosserial_tivac-0.9.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Definitions for rosserial_client targets for TivaC Launchpad evaluation boards."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/Manifest b/dev-ros/rosserial_windows/Manifest
index 7642ef7cb1e1..b7fd4069d988 100644
--- a/dev-ros/rosserial_windows/Manifest
+++ b/dev-ros/rosserial_windows/Manifest
@@ -1 +1,2 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.9.1.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.9.1.ebuild
new file mode 100644
index 000000000000..8b3875a023b5
--- /dev/null
+++ b/dev-ros/rosserial_windows/rosserial_windows-0.9.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosserial_client[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/Manifest b/dev-ros/rosserial_xbee/Manifest
index 7642ef7cb1e1..b7fd4069d988 100644
--- a/dev-ros/rosserial_xbee/Manifest
+++ b/dev-ros/rosserial_xbee/Manifest
@@ -1 +1,2 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.9.1.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.9.1.ebuild
new file mode 100644
index 000000000000..aab6d7663008
--- /dev/null
+++ b/dev-ros/rosserial_xbee/rosserial_xbee-0.9.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools to do communicate between rosserial nodes connected to an xbee"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/pyserial[\${PYTHON_USEDEP}]")
+	dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosserial_python[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_bag/Manifest b/dev-ros/rqt_bag/Manifest
index 5b1c5033321f..d6594ebc8291 100644
--- a/dev-ros/rqt_bag/Manifest
+++ b/dev-ros/rqt_bag/Manifest
@@ -1 +1 @@
-DIST rqt_bag-0.4.13.tar.gz 51027 BLAKE2B 1a65935847c28dbb88ee897b4066620c3d1d83e2f33de7f8a93417ebd8924a572476c24756daaab7ec4c481a2b963fc552ec4a8b9030a1a847c1663b2e9229f7 SHA512 d92511e98c83f821fe967c8f8a4f19b31b03c464996ab3ee10c4d6c5dd61c8d2f65562a683e3d44dcddca862db69a5f850b361231c2a548edc71d6fa861326fd
+DIST rqt_bag-0.4.15.tar.gz 51549 BLAKE2B 87e1a5b997efa6e0b460edd11b14608ba35a49e3b404c2df32fa6f5bf442bca271e9329a2a7eea5b21b07488e0b06b7a23e706fa631dc4146c8911a29ddf36eb SHA512 01df2bf2626057ad05a52f0c069b013fd2f9ef00afa57e76b696fc7b66c6b6766a8ae6f880b1fa5493759b53deb87ac4d12bd5c22fe81ea9192f5ae6f91aa976
diff --git a/dev-ros/rqt_bag/rqt_bag-0.4.13.ebuild b/dev-ros/rqt_bag/rqt_bag-0.4.15.ebuild
similarity index 100%
rename from dev-ros/rqt_bag/rqt_bag-0.4.13.ebuild
rename to dev-ros/rqt_bag/rqt_bag-0.4.15.ebuild
diff --git a/dev-ros/rqt_bag_plugins/Manifest b/dev-ros/rqt_bag_plugins/Manifest
index 5b1c5033321f..d6594ebc8291 100644
--- a/dev-ros/rqt_bag_plugins/Manifest
+++ b/dev-ros/rqt_bag_plugins/Manifest
@@ -1 +1 @@
-DIST rqt_bag-0.4.13.tar.gz 51027 BLAKE2B 1a65935847c28dbb88ee897b4066620c3d1d83e2f33de7f8a93417ebd8924a572476c24756daaab7ec4c481a2b963fc552ec4a8b9030a1a847c1663b2e9229f7 SHA512 d92511e98c83f821fe967c8f8a4f19b31b03c464996ab3ee10c4d6c5dd61c8d2f65562a683e3d44dcddca862db69a5f850b361231c2a548edc71d6fa861326fd
+DIST rqt_bag-0.4.15.tar.gz 51549 BLAKE2B 87e1a5b997efa6e0b460edd11b14608ba35a49e3b404c2df32fa6f5bf442bca271e9329a2a7eea5b21b07488e0b06b7a23e706fa631dc4146c8911a29ddf36eb SHA512 01df2bf2626057ad05a52f0c069b013fd2f9ef00afa57e76b696fc7b66c6b6766a8ae6f880b1fa5493759b53deb87ac4d12bd5c22fe81ea9192f5ae6f91aa976
diff --git a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.13.ebuild b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.15.ebuild
similarity index 100%
rename from dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.13.ebuild
rename to dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.15.ebuild
diff --git a/dev-ros/rqt_image_view/Manifest b/dev-ros/rqt_image_view/Manifest
index d46f10052856..72769075fafa 100644
--- a/dev-ros/rqt_image_view/Manifest
+++ b/dev-ros/rqt_image_view/Manifest
@@ -1 +1 @@
-DIST rqt_image_view-0.4.15.tar.gz 14817 BLAKE2B 00c196bac88eb18f039e88e34d9a943a8e5b052f038682297ecf4c1a31bbb3f25b28a252a6034b774186518a33684f82d94fe89ec2cf6a9449aa961dd2b60435 SHA512 347abc44f930ca2a2d72ed9b8a3c825caf23e0643c80a394c8f74b4452d9549bab8ecc91cf5231d8d51b4be345f3c44783a266cd22c0b1197d3376698b849989
+DIST rqt_image_view-0.4.16.tar.gz 14850 BLAKE2B 9e5c9017166db13f3c2c28d851b932a9854718170da51c840a52c17031bd7604eeb4097d2d60d5504d8d0430efc908a0629bb6d9c986884c6bb63449225b6e44 SHA512 62ee991bd613577f0676d55305c6c95f4687aee7990feebc1178dcaa40e85c61e7a76c11b9393e83aaddba4347a16016a126edffb4511c3d38902136eac62752
diff --git a/dev-ros/rqt_image_view/rqt_image_view-0.4.15.ebuild b/dev-ros/rqt_image_view/rqt_image_view-0.4.16.ebuild
similarity index 100%
rename from dev-ros/rqt_image_view/rqt_image_view-0.4.15.ebuild
rename to dev-ros/rqt_image_view/rqt_image_view-0.4.16.ebuild
diff --git a/dev-ros/rqt_launch/Manifest b/dev-ros/rqt_launch/Manifest
index 934f48cba211..f8361b2d9c5a 100644
--- a/dev-ros/rqt_launch/Manifest
+++ b/dev-ros/rqt_launch/Manifest
@@ -1 +1 @@
-DIST rqt_launch-0.4.8.tar.gz 11471 BLAKE2B 8a96bd774449ffd8988bdde6c2be5cde3b69d819c94eb59ed8be4e179839da9b1eaa959174307481dfe438a5a300665ca1154f500c40a6d2546b6e83f163c2cb SHA512 83a40eca2c2282f2e5e397332b5b61b60ac27312b31ad21c21f03243e1b28961d96ba93f4e8c5043e05791c85d1fa88fee461f4b457934fcb68e47a60239cc89
+DIST rqt_launch-0.4.9.tar.gz 11629 BLAKE2B a2bcb23e5051d43656e636ad654262d68ce69f6edc1ebb24698701564fcd2cec57796019c3cb8c723b697290680365d2b26a38917f19747573609dc04c194f2b SHA512 927ef766836b99686f8c5c8c4ded0bfab5825819f72ae15c0aee817d43f36b280a2143df0e59fe17ab20e4e57ca8002cdf18b6a485f95155e199e062b71fd9b1
diff --git a/dev-ros/rqt_launch/rqt_launch-0.4.8.ebuild b/dev-ros/rqt_launch/rqt_launch-0.4.9.ebuild
similarity index 100%
rename from dev-ros/rqt_launch/rqt_launch-0.4.8.ebuild
rename to dev-ros/rqt_launch/rqt_launch-0.4.9.ebuild
diff --git a/dev-ros/rqt_robot_monitor/Manifest b/dev-ros/rqt_robot_monitor/Manifest
index ab5b4862611d..57e98594241f 100644
--- a/dev-ros/rqt_robot_monitor/Manifest
+++ b/dev-ros/rqt_robot_monitor/Manifest
@@ -1 +1 @@
-DIST rqt_robot_monitor-0.5.12.tar.gz 14917 BLAKE2B 8864165fc491bad7a77e12a769d63e5b404d02cd96ef4dfa33c87ed9e2417ba4bd9a0dfc0cf53507c32e5216e16c8b9f89ee4bb5e762fa4049d846f98d0872c4 SHA512 f354e30a85d6bf8e3f15bbd7b97051b02a3348b37a559a53c8942f5939525e046295f5c6e03902850b137dc705bfad94b5e2fd0554ecfe32e24296c2656ee1b5
+DIST rqt_robot_monitor-0.5.13.tar.gz 15140 BLAKE2B 6c59e7a65cc709d48148df1f757261e5fe70872106b6fe2fc5b1d809340a62321c9d56bf245b5d9fedc87113fd18b5e0ce279245794b2a678f405ea409d72531 SHA512 68b9c57130fed3c4e16a437038c5498ec069440c5064470cc442c051387988f1075dec5dd65191d332c68554d76d2be091d90f5cbc9e2218e849a42ace069045
diff --git a/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.12.ebuild b/dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.13.ebuild
similarity index 100%
rename from dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.12.ebuild
rename to dev-ros/rqt_robot_monitor/rqt_robot_monitor-0.5.13.ebuild
diff --git a/dev-ros/rqt_tf_tree/Manifest b/dev-ros/rqt_tf_tree/Manifest
index 714233023adc..81a0131f8bc2 100644
--- a/dev-ros/rqt_tf_tree/Manifest
+++ b/dev-ros/rqt_tf_tree/Manifest
@@ -1 +1 @@
-DIST rqt_tf_tree-0.6.1.tar.gz 8469 BLAKE2B 0ff1291f982ba0338b75997df868f623682007cbff29b90465aef550463ab8082ca1c068fe4cbca3cfa4a5b46c132cfef089af948300a7e8f1f919933cc1ade6 SHA512 22441bd7313c250f786060d09eb170a42b85ec5414b24be2db1ecdb6d1336acef6a879513793f6a60ddd875ca7fbd1c6b0ac2bde759968440c6c638c62c6c89b
+DIST rqt_tf_tree-0.6.2.tar.gz 8513 BLAKE2B 31207aaa5152c82fd0f728f12348110c7b161b2b36b74330876ccfd8044c98d177341d1ab08860275c6db2f1a043f934b9c2354efa431ea46697fa6af8f29d4e SHA512 1aa03dd674dbb0122c24dcac363850d08b04f2b1aebbfa0c1d3baa3c4b1c9e802a45dabb638d149c03386415601c4751e67b0edae00a577792a37867fb76b69b
diff --git a/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.1.ebuild b/dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.2.ebuild
similarity index 100%
rename from dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.1.ebuild
rename to dev-ros/rqt_tf_tree/rqt_tf_tree-0.6.2.ebuild
diff --git a/dev-ros/urg_node/Manifest b/dev-ros/urg_node/Manifest
index 3a9b6a734ea6..296808c1e794 100644
--- a/dev-ros/urg_node/Manifest
+++ b/dev-ros/urg_node/Manifest
@@ -1 +1 @@
-DIST urg_node-0.1.13.tar.gz 20949 BLAKE2B e85653ec46dd85aa62e4e5f06c4d4c775a2d616f0b4daa80584bf81010ad06acbec7f73e0b4a238618c36ec83d07e4dd513fafa9b29e197ad21b56ec02fe4452 SHA512 be503538a293fa0cdf6e7902c0faa5c866a2298193f4ad6cce705dab90220955d4cb21087d84d10ff7d2daf29f362391f17a038496f3036934c57e12f3270a30
+DIST urg_node-0.1.14.tar.gz 20987 BLAKE2B ee358a238f0886c3eeee213467c44d3e721f4e6fb6c9d887393bdd3eab16d36eb07a62f705256d2a81314afaf29119608a874e26b19afa190a3033e84d3a987d SHA512 2614d614ee88cc5c9087f0ddff5cb991f6707452b42bc00f1c7b0bcbbc6a8fd1915b94fd041526e93ac8b0a481d1b45eeddea32d71a1034362b37e1f458217fb
diff --git a/dev-ros/urg_node/urg_node-0.1.13.ebuild b/dev-ros/urg_node/urg_node-0.1.14.ebuild
similarity index 100%
rename from dev-ros/urg_node/urg_node-0.1.13.ebuild
rename to dev-ros/urg_node/urg_node-0.1.14.ebuild
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest
index 87b6a6cf4910..ab7485b7b7ca 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1 +1 @@
-DIST xacro-1.14.1.tar.gz 80879 BLAKE2B 6ce62c42e194d41bc2c0af322497f2ade2d4ac9e788cd15f3b7b6c976abae575b3bbb1224085d4e2d68cd10d3fbb665b9b333f91a38bdefe4a22f71d9270f005 SHA512 fb2272a4c4da47dcee26860ec94a5b4921401c6a4f0544181c7a9ae188c0cf6bb8ee2c0c0eb6e7fabd3f323c10d391dbafcc2b118384a32ecd18da6c8075ae10
+DIST xacro-1.14.5.tar.gz 81184 BLAKE2B 27234030e313c715cdd2fb9cc2e77f8e3591017ac99ca7af35e7ae6a01bab56175f4f512595ee12ca47a7405ad38cec4d77b6cf71172c24444c31da350be6d3c SHA512 5f3bc7507fcd4774c0a00c5715cf96cb4b2b3ca279df70d0158c7d8eae773df962c10319887f867316ea135937249cb6805bd79b78f70f61d7a767b63dfdf3db
diff --git a/dev-ros/xacro/xacro-1.14.1.ebuild b/dev-ros/xacro/xacro-1.14.5.ebuild
similarity index 100%
rename from dev-ros/xacro/xacro-1.14.1.ebuild
rename to dev-ros/xacro/xacro-1.14.5.ebuild
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 8c579b6bce8e..8afd9d90c71f 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/parser/parser-2.7.2.0-r1.ebuild b/dev-ruby/parser/parser-2.7.2.0-r1.ebuild
index 5c1ecf07603c..09644484d1d2 100644
--- a/dev-ruby/parser/parser-2.7.2.0-r1.ebuild
+++ b/dev-ruby/parser/parser-2.7.2.0-r1.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND+="test? ( =dev-util/ragel-6* )"
+DEPEND+=" =dev-util/ragel-6*"
 
 ruby_add_bdepend "test? (
 	dev-ruby/minitest:5
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index dc48b4b33d55..cbfc0295dc01 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/snack/snack-2.2.10-r9.ebuild b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
index 82c47cba6353..5495854169d5 100644
--- a/dev-tcltk/snack/snack-2.2.10-r9.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.speech.kth.se/snack/"
 SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 IUSE="alsa examples python vorbis"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f165abb5fc44..5f28dcd8b271 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index da67a9a2fede..5b7b7012fe0b 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,6 +1,2 @@
-DIST android-studio-ide-191.6010548-linux.tar.gz 774544822 BLAKE2B eeeed14c8749015f7a0c9235552c04195f81a30a727adfc48d56d2b39ead6d8b017600be801e19fd8eae25ffd2ccbd081b59d464d7ae6bbf14c0a42dd508087d SHA512 95e7befa684b02c5261244a0568f2180a3fd5cee2abe47309f4d183aae1c97b47c08af3cd228462f7db10f3bdb40c591472e74ffb9d89f08301fc25a04f41507
-DIST android-studio-ide-192.6200805-linux.tar.gz 803889418 BLAKE2B dcbfb2eef299456023a3c21a006b32a203566f1fa3d7ce9eb2e6863bfdc9db9f462b911f7ae96f4ccd62f602b424932365355a0b3a684909116ae87448111a86 SHA512 430b145f0816c06ddbd9583da9d609db52f807412b23d02d2ec3b67d947c2bc669a17c45378f3f0ed42a28108ad90b412878e0fcaa8189ae802a6cac2b19138b
-DIST android-studio-ide-192.6241897-linux.tar.gz 803889879 BLAKE2B 5d2d24de5daa317c53513e2a8985e6998891043b1fe730fadd04c6f8ca9702e8be9f2444d73e47578e4d368951897003170ea7e96c569f038f18b98286478df0 SHA512 7ef878ecbc17f542b2faaf18965a294941424f835c21250ff7fde5e29ddc261b35e5e7391cc50803babdcfc98e25390b806f33d0f7dc0f0bcaf7a94feeeab82e
-DIST android-studio-ide-192.6308749-linux.tar.gz 803133146 BLAKE2B 159192929a0cd526c789d915ad15bcc7f6d92e86f1e09f178548ae1055d3086e31f8fb88ceaff55d514728c755eacc84b2abe3c754542fea9e1f5ea117606df5 SHA512 86ce587c2e997dc623498fcf34060568fe58a26f8d287102fc458d963756ba98a4782709cb45f54e847658f64ad263ae2f59bbe1024a5a20be79be821ba9db00
-DIST android-studio-ide-192.6392135-linux.tar.gz 810065819 BLAKE2B e133c346f7ee9ac775efc492f2f0d73a1f82bb95dcf2f108e20fa9201639bff79efa10d67b38187791e1473df3c1ac60c387e741bf5c5fa30b97766ca5f15107 SHA512 246e8b201b99e0d218699a21293c4c85ea334e04d2b13a0ea72e8595e253fe196af2ff9a20920d86a07348aaa64147a13a97a550debe6053d037b49821dc5c8f
 DIST android-studio-ide-193.6626763-linux.tar.gz 907569312 BLAKE2B 602170eea29e632dd5720ef364510a20056a4d98c61e77d5436a2f624a60e0cfa4e0533174613a74f359d8fdeb4e87489caeb5c34b292fcdc35843a76440a9a3 SHA512 7fba99efccdf3bbbfcbc94625aba3789b1bad0e830b2ac890bd681b9089e6789e87b2dbdc80c6ef3d8db2b2438678a8bb58aefb3c311f61f619042ab1ec9dfac
+DIST android-studio-ide-201.6858069-linux.tar.gz 926181537 BLAKE2B ed815f5565ef97ca3f4e1c6cbae3548c70ba94a94a7ae522102044ada31468f241db68ef3d1a1ce6acef60a1bc2e6cd7eba1375a1cebbf01c73063a3d85eb9b2 SHA512 b473e9573e21c666042befa17fde8fc9cb0d6ffd41513d64b74779815079d8971c66afcd1dda5663b503324d14851c4f24a454e5da97e2473550323c09919825
diff --git a/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild b/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild
deleted file mode 100644
index 0eebfe88b67d..000000000000
--- a/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-3.6.1.0.192.6241897.ebuild b/dev-util/android-studio/android-studio-3.6.1.0.192.6241897.ebuild
deleted file mode 100644
index e9812c3699a7..000000000000
--- a/dev-util/android-studio/android-studio-3.6.1.0.192.6241897.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-3.6.2.0.192.6308749.ebuild b/dev-util/android-studio/android-studio-3.6.2.0.192.6308749.ebuild
deleted file mode 100644
index e9812c3699a7..000000000000
--- a/dev-util/android-studio/android-studio-3.6.2.0.192.6308749.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-3.6.3.0.192.6392135.ebuild b/dev-util/android-studio/android-studio-3.6.3.0.192.6392135.ebuild
deleted file mode 100644
index e9812c3699a7..000000000000
--- a/dev-util/android-studio/android-studio-3.6.3.0.192.6392135.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop eutils java-pkg-2
-
-RESTRICT="strip"
-QA_PREBUILT="
-	opt/${PN}/bin/fsnotifier*
-	opt/${PN}/bin/libdbm64.so
-	opt/${PN}/bin/lldb/*
-	opt/${PN}/custom-jdk/*
-	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
-	opt/${PN}/plugins/android/lib/libwebp_jni*.so
-	opt/${PN}/plugins/android/resources/installer/*
-	opt/${PN}/plugins/android/resources/perfetto/*
-	opt/${PN}/plugins/android/resources/simpleperf/*
-	opt/${PN}/plugins/android/resources/transport/*
-"
-
-VER_CMP=( $(ver_rs 1- ' ') )
-if [[ ${#VER_CMP[@]} -eq 6 ]]; then
-	STUDIO_V=$(ver_cut 1-4)
-	BUILD_V=$(ver_cut 5-6)
-else
-	STUDIO_V=$(ver_cut 1-3)
-	BUILD_V=$(ver_cut 4-5)
-fi
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-java/commons-logging:0
-	dev-java/log4j:0"
-
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	dev-java/commons-logging:0
-	dev-java/log4j:0
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1"
-BDEPEND="dev-util/patchelf"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
-	else
-		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-	fi
-	# Replace bundled jars with system
-	# has problems with newer jdom:0 not updated to jdom:2
-	cd "${S}/lib" || die
-	local JARS="commons-logging log4j"
-	local j
-	for j in ${JARS}; do
-		rm -v ${j/:*/}*.jar || die
-		java-pkg_jar-from ${j}
-	done
-
-	cd "${S}" || die
-
-	# bug 629404
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
-	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
-}
-
-src_compile() {
-	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r *
-
-	# This is really a bundled jdk not a jre
-	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
-	if use custom-jdk; then
-		dosym "custom-jdk" "${dir}/jre"
-	else
-		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
-	fi
-
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
-	if use custom-jdk; then
-		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
-		fperms 755 ${dir}/jre/jre/lib/jexec
-	fi
-
-	newicon "bin/studio.png" "${PN}.png"
-	make_wrapper ${PN} ${dir}/bin/studio.sh
-	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
-}
diff --git a/dev-util/android-studio/android-studio-3.6.0.21.192.6200805.ebuild b/dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild
similarity index 100%
rename from dev-util/android-studio/android-studio-3.6.0.21.192.6200805.ebuild
rename to dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 2fe91c4dc74e..0fd7758e4575 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -16,7 +16,7 @@ DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed70597
 DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
 DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
 DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
-DIST android-tools-9.0.0_r3-arch.tar.xz 7628 BLAKE2B d0d7267d41ade2031d72236c18850ea329afbdd57a2b5bf25837e405d3e66d7aaef5b48996e7aafd4cf6e4543de03ba6549823845e5e8cb35c6d4bc900b8e275 SHA512 534d99fe15b3a3ba4f2a7331662fdb8645424830122cc4c1ff0b44d43059280610389147d4a916c55b3be71ac84d019223c90993cbdae2588f9e9737f0b5606d
+DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943
 DIST android-tools-9.0.0_r3-core.tar.gz 27484684 BLAKE2B d071adacd5be0341a9114e57242fe51f623773683b9db2735eac9231a77cc22651f09e1c63682e729494aa6409939696a5635afcd5e8a40ec0f75d2784c00ffc SHA512 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb
 DIST android-tools-9.0.0_r3-e2fsprogs.tar.xz 5255616 BLAKE2B 5fe62da70686148d755c60c1cef4b64d80f0c6a891d13a778d2a3209f950b0f9c5b19bf39ed28c5d38d01103ef1ea474133f57b7104a4fdf80eafd8edc17a3a5 SHA512 a9c3c180ddb96f10710a18794b20cfc641d40af3643a1133091127a40c27fa724b6e6f1af8e66fc1e1ca33053e33499b910880eab05979a2de95a0d3d7a79f93
 DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646ab54e1913d17e9ed0fb0ef3872bd8a459ecad5fbf7324830c1120c367d9515607ecc659fb0f27c4f7db740fda318fd13be1300a6a51 SHA512 13dc145faf919c1f7cc183f823ca46330568daff19ffb110af383876cdb6b0e9f0a83690a4e22633b572c1e6c2aba14ef0181c01720095173d258320229e9108
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index 0a5d152abd25..b2b942ac225a 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -18,7 +18,7 @@ BORINGSSL_SHA1="45210dd4e21ace9d28cb76b3f83303fcdd2efcce"
 GLIBC_GETTID_PATCH="${P}-fix-build-with-glibc-2.30.patch"
 # The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
 # No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> ${MY_P}-arch.tar.xz
+SRC_URI="https://github.com/archlinux/svntogit-community/archive/0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.gz -> ${MY_P}-arch.tar.gz
 	https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
 	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
 	mirror://gentoo/${MY_P}-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-e2fsprogs.tar.xz
@@ -61,7 +61,7 @@ unpack_into() {
 }
 
 src_unpack() {
-	unpack_into "${MY_P}-arch.tar.xz" arch
+	unpack_into "${MY_P}-arch.tar.gz" arch
 	unpack_into "${MY_P}-core.tar.gz" core
 	unpack_into "${MY_P}-e2fsprogs.tar.xz" ./e2fsprogs
 	unpack_into "${MY_P}-extras.tar.xz" extras
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
deleted file mode 100644
index 36c89fee7e76..000000000000
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# See helper scripts in files/ for creating these tarballs and getting this hash.
-BORINGSSL_SHA1="45210dd4e21ace9d28cb76b3f83303fcdd2efcce"
-# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
-# No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> ${MY_P}-arch.tar.xz
-	https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
-	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
-	mirror://gentoo/${MY_P}-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-e2fsprogs.tar.xz
-	mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-extras.tar.xz
-	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-selinux.tar.xz
-	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-f2fs-tools.tar.xz
-	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}.ninja.xz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="sys-libs/zlib:=
-	dev-libs/libpcre2:=
-	virtual/libusb:1="
-RDEPEND="${DEPEND}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND+="
-	dev-lang/go"
-
-S=${WORKDIR}
-CMAKE_USE_DIR="${S}/boringssl"
-
-unpack_into() {
-	local archive="$1"
-	local dir="$2"
-
-	mkdir -p "${dir}"
-	pushd "${dir}" >/dev/null || die
-	unpack "${archive}"
-	if [[ ${dir} != ./* ]] ; then
-		mv */* ./ || die
-	fi
-	popd >/dev/null
-}
-
-src_unpack() {
-	unpack_into "${MY_P}-arch.tar.xz" arch
-	unpack_into "${MY_P}-core.tar.gz" core
-	unpack_into "${MY_P}-e2fsprogs.tar.xz" ./e2fsprogs
-	unpack_into "${MY_P}-extras.tar.xz" extras
-	unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
-	unpack_into "${MY_P}-selinux.tar.xz" ./selinux
-	unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
-
-	unpack "${MY_P}.ninja.xz"
-	mv "${MY_P}.ninja" "build.ninja" || die
-
-	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
-	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
-}
-
-src_prepare() {
-	sed -e 's:elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386"):\0\n  set(ARCH "x86")\nelseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586"):' \
-		-i "${S}"/boringssl/CMakeLists.txt || die #668792
-
-	cd "${S}"/core || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
-	eapply "${FILESDIR}"/android-tools-8.1.0_p1-build.patch
-
-	cd "${S}"/selinux || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
-
-	cd "${S}"/e2fsprogs || die
-	eapply "${WORKDIR}"/arch/trunk/fix_build_e2fsprogs.patch
-
-	cd "${S}"/extras
-	sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
-		-e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
-		-e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
-		-i ext4_utils/include/ext4_utils/ext4_crypt{,_init_extensions}.h || die #580686
-
-	cd "${S}" || die
-	default
-
-	sed -E \
-		-e "s|^(CC =).*|\\1 $(tc-getCC)|g" \
-		-e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \
-		-e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \
-		-e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \
-		-e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \
-		-e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \
-		-e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \
-		-i build.ninja || die
-
-	# The pregenerated ninja file expects the build/ dir.
-	BUILD_DIR="${CMAKE_USE_DIR}/build"
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	append-lfs-flags
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# We only need a few libs from boringssl.
-	cmake-utils_src_compile libcrypto.a libssl.a
-
-	eninja
-}
-
-src_install() {
-	dobin adb e2fsdroid ext2simg fastboot mke2fs.android
-	dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
-	use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
-	newbashcomp arch/trunk/bash_completion.fastboot fastboot
-}
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index e2012a736da3..daf0db1703c4 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1,2 +1 @@
-DIST catkin-0.8.3.tar.gz 215988 BLAKE2B 92d7bced93e2d33dafcfd902724f993aa15756139265b5594c15041c333568591193b86e1a4bee8c278f2739dd063f73b6ce675b8ab4fefd312b5daeea414c7a SHA512 14fd03627f3fb339a850ca73e7a49dfeb7312a85416473dff60995ea1d0f1050982929c297751502589a7320dd7eec5d922c86061166f9d475fc1108540db4ae
 DIST catkin-0.8.8.tar.gz 217566 BLAKE2B c17ed55e4f72f6645a778b5669e9b54090ea0425526d7540a6c8cf3af88ba10dfd91b927f53a83d9d2fac56e000c4c52e93216a36694475a91fabe00dd2d0168 SHA512 a90c552bebb46ade23171c85ca1cb23b295d156e731c29cd7602e544aef6231edb179d0fce52d06008d762bafd309456e0ef8976a3f67ed9ea861b905b1bb979
diff --git a/dev-util/catkin/catkin-0.8.3-r1.ebuild b/dev-util/catkin/catkin-0.8.3-r1.ebuild
deleted file mode 100644
index c11d65241502..000000000000
--- a/dev-util/catkin/catkin-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="https://wiki.ros.org/catkin"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/empy[${PYTHON_USEDEP}]
-	dev-util/cmake
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
-BDEPEND="
-	dev-util/cmake
-"
-
-PATCHES=(
-	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils-v2.patch"
-	"${FILESDIR}/catkin_prefix_path.patch"
-	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
-	"${FILESDIR}/package_xml.patch"
-	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/egginfo.patch"
-)
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
-		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
-		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
-		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
-		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
-		cmake/*.cmake || die
-	cmake-utils_src_prepare
-}
-
-catkin_src_configure_internal() {
-	local sitedir="$(python_get_sitedir)"
-	mycmakeargs+=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
-	)
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	export PYTHONPATH="${S}/python"
-	local mycmakeargs=(
-		"-DCATKIN_ENABLE_TESTING=$(usex test)"
-		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
-		)
-	python_foreach_impl catkin_src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
-	unset PYTHON_SCRIPTDIR
-	python_foreach_impl cmake-utils_src_test
-}
-
-catkin_src_install_internal() {
-	python_export PYTHON_SCRIPTDIR
-	cmake-utils_src_install
-	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
-		dodir /usr/bin
-		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
-		done
-		touch "${T}/.catkin_python_symlinks_generated"
-	fi
-}
-
-src_install() {
-	python_foreach_impl catkin_src_install_internal
-
-	doenvd "${FILESDIR}/40catkin"
-
-	# needed to be considered as a workspace
-	touch "${ED}/usr/.catkin"
-
-	python_foreach_impl python_optimize
-}
-
-pkg_postinst() {
-	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
-	ewarn "installation path for package.xml files on Gentoo."
-	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
-	ewarn "packages that have it installed in the old location:"
-	ewarn "		emerge -1O /usr/share/*/package.xml"
-	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
-}
diff --git a/dev-util/catkin/catkin-0.8.8-r1.ebuild b/dev-util/catkin/catkin-0.8.8-r1.ebuild
index 46bed14e7929..4907543b6705 100644
--- a/dev-util/catkin/catkin-0.8.8-r1.ebuild
+++ b/dev-util/catkin/catkin-0.8.8-r1.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit ${SCM} cmake python-r1 python-utils-r1
 
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 46bed14e7929..4907543b6705 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit ${SCM} cmake python-r1 python-utils-r1
 
diff --git a/dev-util/catkin/files/egginfo.patch b/dev-util/catkin/files/egginfo.patch
deleted file mode 100644
index a33e066ced66..000000000000
--- a/dev-util/catkin/files/egginfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: catkin-0.8.3/cmake/catkin_python_setup.cmake
-===================================================================
---- catkin-0.8.3.orig/cmake/catkin_python_setup.cmake
-+++ catkin-0.8.3/cmake/catkin_python_setup.cmake
-@@ -143,7 +143,7 @@ function(catkin_python_setup)
- 
-   assert(PYTHON_INSTALL_DIR)
-   if(${PROJECT_NAME}_SETUP_PY_SETUP_MODULE STREQUAL "setuptools")
--    set(SETUPTOOLS_EGG_INFO "egg_info --egg-base ${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}")
-+    set(SETUPTOOLS_EGG_INFO "egg_info --egg-base \${DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}")
-   else()
-     set(SETUPTOOLS_EGG_INFO "")
-   endif()
diff --git a/dev-util/rbtools/rbtools-1.0.3.ebuild b/dev-util/rbtools/rbtools-1.0.3.ebuild
index 4ef4c539a64b..54e4b29bf4d8 100644
--- a/dev-util/rbtools/rbtools-1.0.3.ebuild
+++ b/dev-util/rbtools/rbtools-1.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 62b539b613b1..bd708b7dd6f7 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/dune.eclass b/eclass/dune.eclass
index 9ab6ec204c21..2cab58a1de0a 100644
--- a/eclass/dune.eclass
+++ b/eclass/dune.eclass
@@ -4,6 +4,7 @@
 # @ECLASS: dune.eclass
 # @MAINTAINER:
 # rkitover@gmail.com
+# Mark Wright <gienah@gentoo.org>
 # @AUTHOR:
 # Rafael Kitover <rkitover@gmail.com>
 # @SUPPORTED_EAPIS: 5 6 7
@@ -25,8 +26,10 @@ esac
 EXPORT_FUNCTIONS src_compile src_test src_install
 
 RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
-DEPEND="${RDEPEND}
-	dev-ml/dune"
+case ${EAPI:-0} in
+	0|1|2|3|4|5|6) DEPEND="${RDEPEND} dev-ml/dune";;
+	*) BDEPEND="dev-ml/dune dev-lang/ocaml"; DEPEND="${RDEPEND}" ;;
+esac
 
 dune_src_compile() {
 	dune build @install || die
diff --git a/eclass/opam.eclass b/eclass/opam.eclass
index 382dc00e511b..0420b99f71c5 100644
--- a/eclass/opam.eclass
+++ b/eclass/opam.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: opam.eclass
 # @MAINTAINER:
-# maintainer-needed@gentoo.org
+# Mark Wright <gienah@gentoo.org>
 # @AUTHOR:
 # Alexis Ballier <aballier@gentoo.org>
 # @SUPPORTED_EAPIS: 5 6 7
@@ -17,9 +17,21 @@ case ${EAPI:-0} in
 	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
 esac
 
+# @ECLASS-VARIABLE: OPAM_INSTALLER_DEP
+# @DESCRIPTION:
+# Override dependency for OPAM_INSTALLER
+: ${OPAM_INSTALLER_DEP:="dev-ml/opam-installer"}
+
 RDEPEND=">=dev-lang/ocaml-4:="
-DEPEND="${RDEPEND}
-	dev-ml/opam"
+case ${EAPI:-0} in
+	0|1|2|3|4|5|6) DEPEND="${RDEPEND} ${OPAM_INSTALLER_DEP}";;
+	*) BDEPEND="${OPAM_INSTALLER_DEP} dev-lang/ocaml"; DEPEND="${RDEPEND}" ;;
+esac
+
+# @ECLASS-VARIABLE: OPAM_INSTALLER
+# @DESCRIPTION:
+# Eclass can use different opam-installer binary than the one provided in by system.
+: ${OPAM_INSTALLER:=opam-installer}
 
 # @FUNCTION: opam-install
 # @USAGE: <list of packages>
@@ -29,7 +41,7 @@ DEPEND="${RDEPEND}
 opam-install() {
 	local pkg
 	for pkg ; do
-		opam-installer -i \
+		${OPAM_INSTALLER} -i \
 			--prefix="${ED%/}/usr" \
 			--libdir="${D%/}/$(ocamlc -where)" \
 			--docdir="${ED%/}/usr/share/doc/${PF}" \
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
index 2c9708f24593..5448bf2155d8 100644
--- a/eclass/verify-sig.eclass
+++ b/eclass/verify-sig.eclass
@@ -119,7 +119,7 @@ verify-sig_src_unpack() {
 		# find all distfiles and signatures, and combine them
 		for f in ${A}; do
 			found=
-			for suffix in .sig; do
+			for suffix in .asc .sig; do
 				if [[ ${f} == *${suffix} ]]; then
 					signatures+=( "${f}" )
 					found=sig
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 59f829803803..e0447f05ec00 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/love/Manifest b/games-engines/love/Manifest
index 5edf4012ba9b..dc1d7facea60 100644
--- a/games-engines/love/Manifest
+++ b/games-engines/love/Manifest
@@ -1,4 +1,3 @@
-DIST love-0.10.2-linux-src.tar.gz 1698376 BLAKE2B aac7baaa51b4def09d73bcf6cbc3c98835c4b12f2608d229a8aeb3eb39a82285964f7cef0063c461bdae6e4431adf4f48e83be499a76ce463f941c7778d4a229 SHA512 81c0bb5a454ed9abc692784f155933288a2bd5ba5ffb919c7709584e7e8d68fca10b5ea1e3a386def46b18f071b217ffbc2914a8ea08424226f0580020fce076
 DIST love-0.7.2-linux-src.tar.gz 900209 BLAKE2B abd0db98d210c5523d3b5a75c30bcfa2fc9d7760c7642d08dda28690ab72ddf8a0c7b60793cd7b0f902a8e3fcf2750748c75caf29638a7455572d84683be7820 SHA512 cbca1d7e3425d1ecbdae019212dfa2814d8ac3bad1faedd4b052cf3e89b5bf2fac6e422283628e4c125858c9db050dee2129476d1a73ec44ffe8a4704f170f61
 DIST love-0.8.0-linux-src.tar.gz 1027356 BLAKE2B bfbc2f9a3d5c3beffb4790a69716416815534c3b390b1554722eceaec57a7530377c06c15c6551aa972b33176bccdadfc8ad12bc186ceda201527bd9f8286d6f SHA512 6a0e28d102b950d3dddf7101996fe0ad04dfd7d4ec5e58797b41ef3382b60e74f90c6e707f882cf43cc0c5cc98703857eefc6418e6a6fd34e88f8019143f55a4
-DIST love-11.1-linux-src.tar.gz 2733030 BLAKE2B 28b8bb4ea65fada095d725d438fa13a3d1210b2ab6e48932d1e62d342711e0d38ab0f84380fcb7e1b03b0bca6ab112ed66e848bb63aef6fde02605ba819209ae SHA512 f4df860508b75e4bb7c0ee8a2ee4406a7c8f3ce65cdbca9ed8a0cd90df81507ba7ec9a9d45279488047cc16b6e51940edff54e7a34de63bf852dbec5115b4c03
+DIST love-11.3-linux-src.tar.gz 2898851 BLAKE2B ae854dbe1f98fa2adaf118ac01b7519f87cbf684dff45622e0de6503a514bc6336c469b08a6c19ae55f7a0d65063bebffe0dc1d0a72483a9032902469c1c643f SHA512 d02900bbad658da7127bdbc52ceb8282a725b32d6a17fc51962327411be94f81b2c871d21b3c4bd8492a4ca355c3cfb1f04a7fe010d6c69ae35c7c5d64579e1b
diff --git a/games-engines/love/files/love-0.7.2-opengl_glext_prototypes.patch b/games-engines/love/files/love-0.7.2-opengl_glext_prototypes.patch
new file mode 100644
index 000000000000..887f61ddd560
--- /dev/null
+++ b/games-engines/love/files/love-0.7.2-opengl_glext_prototypes.patch
@@ -0,0 +1,19 @@
+diff -ur love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp love-HEAD/src/modules/graphics/opengl/Framebuffer.cpp
+--- love-HEAD.orig/src/modules/graphics/opengl/Framebuffer.cpp	2019-06-03 01:15:56.600016765 +0200
++++ love-HEAD/src/modules/graphics/opengl/Framebuffer.cpp	2019-06-03 01:16:16.737916762 +0200
+@@ -1,3 +1,4 @@
++#define GL_GLEXT_PROTOTYPES
+ #include "Framebuffer.h"
+ #include <common/Matrix.h>
+ 
+diff -ur love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp love-HEAD/src/modules/graphics/opengl/SpriteBatch.cpp
+--- love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp	2019-06-03 01:15:56.601016760 +0200
++++ love-HEAD/src/modules/graphics/opengl/SpriteBatch.cpp	2019-06-03 01:16:31.007845896 +0200
+@@ -18,6 +18,7 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ **/
+ 
++#define GL_GLEXT_PROTOTYPES
+ #include "SpriteBatch.h"
+ 
+ // STD
diff --git a/games-engines/love/files/love-0.8.0-opengl_glext_prototypes.patch b/games-engines/love/files/love-0.8.0-opengl_glext_prototypes.patch
new file mode 100644
index 000000000000..300bc3383433
--- /dev/null
+++ b/games-engines/love/files/love-0.8.0-opengl_glext_prototypes.patch
@@ -0,0 +1,54 @@
+diff -ur love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp love-HEAD/src/modules/graphics/opengl/SpriteBatch.cpp
+--- love-HEAD.orig/src/modules/graphics/opengl/SpriteBatch.cpp
++++ love-HEAD/src/modules/graphics/opengl/SpriteBatch.cpp
+@@ -18,6 +18,7 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ **/
+ 
++#define GL_GLEXT_PROTOTYPES
+ #include "SpriteBatch.h"
+ 
+ // STD
+--- a/src/modules/graphics/opengl/VertexBuffer.cpp
++++ b/src/modules/graphics/opengl/VertexBuffer.cpp
+@@ -18,6 +18,9 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ **/
+ 
++#define GL_GLEXT_PROTOTYPES
++#include "SpriteBatch.h"
++
+ #include "VertexBuffer.h"
+ 
+ #include "common/Exception.h"
+--- a/src/modules/graphics/opengl/Graphics.cpp
++++ b/src/modules/graphics/opengl/Graphics.cpp
+@@ -18,6 +18,7 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ **/
+ 
++#define GL_GLEXT_PROTOTYPES
+ #include <common/config.h>
+ #include <common/math.h>
+ #include <common/Vector.h>
+--- a/src/modules/graphics/opengl/PixelEffect.cpp
++++ b/src/modules/graphics/opengl/PixelEffect.cpp
+@@ -18,6 +18,7 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ **/
+ 
++#define GL_GLEXT_PROTOTYPES
+ #include "PixelEffect.h"
+ #include "GLee.h"
+ 
+
+--- a/src/modules/graphics/opengl/Canvas.cpp
++++ b/src/modules/graphics/opengl/Canvas.cpp
+@@ -18,6 +18,7 @@
+ * 3. This notice may not be removed or altered from any source distribution.
+ **/
+
++#define GL_GLEXT_PROTOTYPES
+ #include "Canvas.h"
+ #include "Graphics.h"
+ #include <common/Matrix.h>
diff --git a/games-engines/love/love-0.7.2-r2.ebuild b/games-engines/love/love-0.7.2-r2.ebuild
index e29f78d0863e..0743c3dd9250 100644
--- a/games-engines/love/love-0.7.2-r2.ebuild
+++ b/games-engines/love/love-0.7.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="http://love2d.org/"
-SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
+HOMEPAGE="https://love2d.org/"
+SRC_URI="https://github.com/love2d/${PN}/releases/download/${PV}/${P}-linux-src.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0.7"
@@ -31,7 +31,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}-HEAD"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.8.0-freetype2.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.2-opengl_glext_prototypes.patch
+	"${FILESDIR}"/${PN}-0.8.0-freetype2.patch
+)
 
 src_install() {
 	DOCS="readme.txt changes.txt" \
diff --git a/games-engines/love/love-0.8.0-r1.ebuild b/games-engines/love/love-0.8.0-r1.ebuild
deleted file mode 100644
index 4545622486fc..000000000000
--- a/games-engines/love/love-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="http://love2d.org/"
-SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-games/physfs
-	dev-lang/lua:0[deprecated]
-	media-libs/devil[mng,png,tiff]
-	media-libs/freetype:2
-	media-libs/libmodplug
-	media-libs/libsdl[joystick,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-sound/mpg123
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	media-libs/libmng:0
-	media-libs/tiff:0
-"
-
-PATCHES=( "${FILESDIR}"/${P}-freetype2.patch )
-
-src_install() {
-	DOCS="readme.md changes.txt" \
-		default
-}
diff --git a/games-engines/love/love-0.8.0-r2.ebuild b/games-engines/love/love-0.8.0-r2.ebuild
index 6349e6228b72..9297277d9f52 100644
--- a/games-engines/love/love-0.8.0-r2.ebuild
+++ b/games-engines/love/love-0.8.0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="http://love2d.org/"
-SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
+HOMEPAGE="https://love2d.org/"
+SRC_URI="https://github.com/love2d/${PN}/releases/download/${PV}/${P}-linux-src.tar.gz"
 KEYWORDS="~amd64 ~arm ~x86"
 
 LICENSE="ZLIB"
@@ -29,7 +29,10 @@ DEPEND="${RDEPEND}
 	media-libs/tiff:0
 "
 
-PATCHES=( "${FILESDIR}"/${P}-freetype2.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.0-freetype2.patch
+	"${FILESDIR}"/${PN}-0.8.0-opengl_glext_prototypes.patch
+)
 
 src_install() {
 	DOCS="readme.md changes.txt" \
diff --git a/games-engines/love/love-0.10.2.ebuild b/games-engines/love/love-11.3-r100.ebuild
similarity index 68%
rename from games-engines/love/love-0.10.2.ebuild
rename to games-engines/love/love-11.3-r100.ebuild
index 9ac920cc9cd8..4de07ea8e793 100644
--- a/games-engines/love/love-0.10.2.ebuild
+++ b/games-engines/love/love-11.3-r100.ebuild
@@ -1,30 +1,30 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit gnome2-utils xdg-utils
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua-single xdg-utils
 
 if [[ ${PV} == 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/rude/${PN}"
-	SRC_URI=""
-	KEYWORDS=""
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/love2d/${PN}.git"
 else
-	SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
+	SRC_URI="https://github.com/love2d/${PN}/releases/download/${PV}/${P}-linux-src.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="http://love2d.org/"
+HOMEPAGE="https://love2d.org/"
 
 LICENSE="ZLIB"
-SLOT="0.10"
-IUSE="+luajit"
+SLOT="0"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="sys-libs/zlib
-	dev-games/physfs
-	!luajit? ( dev-lang/lua:0[deprecated] )
-	luajit? ( dev-lang/luajit:2 )
+	${LUA_DEPS}
 	media-libs/freetype
 	media-libs/libmodplug
 	media-libs/libsdl2[joystick,opengl]
@@ -46,15 +46,16 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-lua=$(usex luajit luajit lua)
+	econf --with-lua=$(usex lua_single_target_luajit luajit lua) \
+		--with-luaversion=$(ver_cut 1-2 $(lua_get_version))
 }
 
 src_install() {
 	default
 
 	find "${D}" -name '*.la' -delete || die
-	if [[ ${SLOT} != 0 ]]
-	then
+
+	if [[ ${SLOT} != 0 ]]; then
 		mv "${ED}/usr/bin/${PN}" "${ED}/usr/bin/${PN}-${SLOT}" || die
 		mv "${ED}"/usr/share/applications/love{,"-$SLOT"}.desktop || die
 		sed -i -e "/^Name=/s/$/ ($SLOT)/" -e "s|/usr/bin/love|/usr/bin/love-$SLOT|" "${ED}/usr/share/applications/love-$SLOT.desktop" || die
@@ -63,13 +64,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
diff --git a/games-engines/love/love-11.1.ebuild b/games-engines/love/love-11.3.ebuild
similarity index 75%
rename from games-engines/love/love-11.1.ebuild
rename to games-engines/love/love-11.3.ebuild
index 8f965557a423..df62bac35ad5 100644
--- a/games-engines/love/love-11.1.ebuild
+++ b/games-engines/love/love-11.3.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit gnome2-utils xdg-utils
+EAPI=7
+
+inherit xdg-utils
 
 if [[ ${PV} == 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/rude/${PN}"
-	SRC_URI=""
-	KEYWORDS=""
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/love2d/${PN}.git"
 else
-	SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
+	SRC_URI="https://github.com/love2d/${PN}/releases/download/${PV}/${P}-linux-src.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="http://love2d.org/"
+HOMEPAGE="https://love2d.org/"
 
 LICENSE="ZLIB"
 SLOT="0"
 IUSE="+luajit"
 
 RDEPEND="sys-libs/zlib
-	!luajit? ( dev-lang/lua:0[deprecated] )
+	!luajit? ( dev-lang/lua:0 )
 	luajit? ( dev-lang/luajit:2 )
 	media-libs/freetype
 	media-libs/libmodplug
@@ -52,8 +51,8 @@ src_install() {
 	default
 
 	find "${D}" -name '*.la' -delete || die
-	if [[ ${SLOT} != 0 ]]
-	then
+
+	if [[ ${SLOT} != 0 ]]; then
 		mv "${ED}/usr/bin/${PN}" "${ED}/usr/bin/${PN}-${SLOT}" || die
 		mv "${ED}"/usr/share/applications/love{,"-$SLOT"}.desktop || die
 		sed -i -e "/^Name=/s/$/ ($SLOT)/" -e "s|/usr/bin/love|/usr/bin/love-$SLOT|" "${ED}/usr/share/applications/love-$SLOT.desktop" || die
@@ -62,13 +61,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
diff --git a/games-engines/love/love-9999.ebuild b/games-engines/love/love-9999.ebuild
index c4f181125e4f..6265299294f3 100644
--- a/games-engines/love/love-9999.ebuild
+++ b/games-engines/love/love-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit gnome2-utils xdg-utils
+EAPI=7
+
+inherit xdg-utils
 
 if [[ ${PV} == 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/rude/${PN}"
-	SRC_URI=""
-	KEYWORDS=""
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/love2d/${PN}.git"
 else
-	SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
+	SRC_URI="https://github.com/love2d/${PN}/releases/download/${PV}/${P}-linux-src.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -22,7 +21,7 @@ SLOT="0"
 IUSE="+luajit"
 
 RDEPEND="sys-libs/zlib
-	!luajit? ( dev-lang/lua:0[deprecated] )
+	!luajit? ( dev-lang/lua:0 )
 	luajit? ( dev-lang/luajit:2 )
 	media-libs/freetype
 	media-libs/libmodplug
@@ -52,23 +51,23 @@ src_install() {
 	default
 
 	find "${D}" -name '*.la' -delete || die
-	if [ "$SLOT" != "0" ]
-	then
+
+	if [[ ${SLOT} != 0 ]]; then
 		mv "${ED}/usr/bin/${PN}" "${ED}/usr/bin/${PN}-${SLOT}" || die
 		mv "${ED}"/usr/share/applications/love{,"-$SLOT"}.desktop || die
-		sed -i "s|/usr/bin/love|/usr/bin/love-$SLOT|" "${ED}/usr/share/applications/love-$SLOT.desktop" || die
-		rm "${ED}"/usr/{lib64/liblove.so,share/{mime/packages/love.xml,pixmaps/love.svg,icons/hicolor/scalable/mimetypes/application-x-love-game.svg,man/man1/love.1}} || die
+		sed -i -e "/^Name=/s/$/ ($SLOT)/" -e "s|/usr/bin/love|/usr/bin/love-$SLOT|" "${ED}/usr/share/applications/love-$SLOT.desktop" || die
+		rm -r "${ED}"/usr/{lib64/liblove.so,share/{mime/,pixmaps/,icons/,man/}} || die
 	fi
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
diff --git a/games-engines/love/metadata.xml b/games-engines/love/metadata.xml
index 585b0dc75dda..3e5026ee3754 100644
--- a/games-engines/love/metadata.xml
+++ b/games-engines/love/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 -->
-	</pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch b/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch
index d0da8a2563b3..3bf5915bb65d 100644
--- a/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch
+++ b/games-engines/openmw/files/openmw-0.47.0-mygui-license.patch
@@ -4,13 +4,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index d69352c94..5f97c86e9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -470,9 +470,6 @@ IF(NOT WIN32 AND NOT APPLE)
-     #    INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Plugin_MyGUI_OpenMW_Resources.so" DESTINATION "${LIBDIR}" )
-     #ENDIF(BUILD_MYGUI_PLUGIN)
+@@ -856,9 +856,6 @@ elseif(NOT APPLE)
+             INSTALL(PROGRAMS "${INSTALL_SOURCE}/openmw-wizard" DESTINATION "${BINDIR}" )
+         ENDIF(BUILD_WIZARD)
  
--    # Install licenses
--    INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION "${LICDIR}" )
+-        # Install licenses
+-        INSTALL(FILES "files/mygui/DejaVuFontLicense.txt" DESTINATION "${LICDIR}" )
 -
-     # Install icon and desktop file
-     INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
-     INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw")
+         # Install icon and desktop file
+         INSTALL(FILES "${OpenMW_BINARY_DIR}/org.openmw.launcher.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
+         INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw")
diff --git a/games-engines/openmw/openmw-0.46.0.ebuild b/games-engines/openmw/openmw-0.46.0.ebuild
index abb4174bc5fe..5de3fb3d92af 100644
--- a/games-engines/openmw/openmw-0.46.0.ebuild
+++ b/games-engines/openmw/openmw-0.46.0.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 	media-libs/libsdl2[joystick,opengl,video]
 	media-libs/openal
 	media-video/ffmpeg:=
-	>=sci-physics/bullet-2.86:=
+	>=sci-physics/bullet-2.86:=[-double-precision]
 	virtual/opengl
 	osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
 	!osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
diff --git a/games-engines/openmw/openmw-9999.ebuild b/games-engines/openmw/openmw-9999.ebuild
index 1183e5459a13..70603fec46ab 100644
--- a/games-engines/openmw/openmw-9999.ebuild
+++ b/games-engines/openmw/openmw-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	media-libs/libsdl2[joystick,opengl,video]
 	media-libs/openal
 	media-video/ffmpeg:=
-	>=sci-physics/bullet-2.86:=
+	>=sci-physics/bullet-2.86:=[double-precision]
 	virtual/opengl
 	osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
 	!osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] )
@@ -96,6 +96,7 @@ src_configure() {
 		-DMORROWIND_DATA_FILES="${EPREFIX}/usr/share/morrowind-data"
 		-DUSE_SYSTEM_TINYXML=ON
 		-DDESIRED_QT_VERSION=5
+		-DBULLET_USE_DOUBLES=ON
 	)
 
 	cmake_src_configure
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 0a6cb4aec82b..9183c1a7360f 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/chocolate-doom/Manifest b/games-fps/chocolate-doom/Manifest
index 86587c978d8d..b2cd839d0fdd 100644
--- a/games-fps/chocolate-doom/Manifest
+++ b/games-fps/chocolate-doom/Manifest
@@ -1 +1,2 @@
+DIST chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch 26736 BLAKE2B 3b75eaf6ea38280eb649eb0a35cf72376fc8daafda51a79bb321e1ac9311bd7d7edc6b7740b235288c32142c01fcf346045091783912739317556a78eb07751a SHA512 64512c47d404de1a85f84948bcf780257070f5b22dce6fa7dba66ba65027a15e93e39145424be327de4abd1f1f3b994fcd936e3dcdc564f1f96238b133a3a554
 DIST chocolate-doom-3.0.1.tar.gz 2245563 BLAKE2B 0c9babfbc9e52ea7822ca00c0dbf84e471bfe6d6ec94f729d3d0f72243205b060e5a3b5f1f99728da7764e81af735b45d001bb368dd2b5796666554e3c911090 SHA512 2a81905cf619ea2def7e2f9ebe65b38543d01bd83a95e535e88d04a79f2676f8ba0da64031a650bd905e1345cda1b9d28a398ad87c10c92f2d3d50f3253ec214
diff --git a/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild b/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild
index 5809e2bf6321..42f25a285d47 100644
--- a/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild
+++ b/games-fps/chocolate-doom/chocolate-doom-3.0.1.ebuild
@@ -9,7 +9,8 @@ inherit autotools prefix python-any-r1 xdg
 
 DESCRIPTION="A Doom source port that is minimalist and historically accurate"
 HOMEPAGE="https://www.chocolate-doom.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz
+	https://gist.githubusercontent.com/vilhelmgray/28d4713cb6387ad62ab76cfac1443355/raw/f7600d93ca45a5102969b8f89974a3c36a3563f5/${P}-overhaul-manpages-add-parameters.patch"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
@@ -30,7 +31,7 @@ BDEPEND="
 S="${WORKDIR}/${PN}-${P}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-overhaul-manpages-add-parameters.patch"
+	"${DISTDIR}/${P}-overhaul-manpages-add-parameters.patch"
 	"${FILESDIR}/${P}-further-manpage-substitutions-and-fixes.patch"
 	"${FILESDIR}/${P}-bash-completion-run-docgen-with-z-argument.patch"
 	"${FILESDIR}/${P}-install-AppStream-metadata-into-the-proper-location.patch"
diff --git a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch b/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch
deleted file mode 100644
index 95e01e53e1f7..000000000000
--- a/games-fps/chocolate-doom/files/chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch
+++ /dev/null
@@ -1,695 +0,0 @@
-From e0b8a7e0a9e0ee8c5983b94b849a8a69a5592464 Mon Sep 17 00:00:00 2001
-From: Jonathan Dowland <jon@dow.land>
-Date: Mon, 27 Nov 2017 21:17:55 +0000
-Subject: [PATCH] overhaul manpages, add parameters
-
-This is in order to better support derivative engines.
-
-Rework the manpages to be parameterized with @PROGRAM_PREFIX@ and
-@PACKAGE_NAME@. Alter the `docgen` generator to substitute those
-parameters. Supply those parameters via the autofoo Makefile.
-
-Adjust the fixed path chocolate-server.6 to be generated from
-server.template, similar to doom.template -> chocolate-doom.6.
-
-Further work is required, not least renaming chocolate-setup.6,
-but several further parameterizations.
----
- man/Makefile.am                             | 68 ++++++++++++++-------
- man/bash-completion/Makefile.am             | 13 ++--
- man/chocolate-setup.6                       | 22 +++----
- man/default.cfg.template                    | 18 +++---
- man/docgen                                  | 32 ++++++----
- man/doom.template                           | 30 ++++-----
- man/extra.cfg.template                      | 24 ++++----
- man/heretic.template                        | 20 +++---
- man/hexen.template                          | 20 +++---
- man/{chocolate-server.6 => server.template} | 20 +++---
- man/strife.template                         | 18 +++---
- 11 files changed, 161 insertions(+), 124 deletions(-)
- rename man/{chocolate-server.6 => server.template} (74%)
-
-diff --git a/man/Makefile.am b/man/Makefile.am
-index cfd2dc66..5916edf9 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -29,7 +29,8 @@ GENERATED_MAN_PAGES =               \
-            @PROGRAM_PREFIX@hexen.cfg.5    \
-            @PROGRAM_PREFIX@strife.6       \
-            strife.cfg.5             \
--           @PROGRAM_PREFIX@strife.cfg.5
-+           @PROGRAM_PREFIX@strife.cfg.5   \
-+           @PROGRAM_PREFIX@server.6
- 
- SETUP_MAN_PAGES =                          \
-            @PROGRAM_PREFIX@doom-setup.6    \
-@@ -37,8 +38,7 @@ SETUP_MAN_PAGES =                          \
-            @PROGRAM_PREFIX@hexen-setup.6   \
-            @PROGRAM_PREFIX@strife-setup.6
- 
--man_MANS = chocolate-server.6             \
--           chocolate-setup.6              \
-+man_MANS = chocolate-setup.6              \
-            $(GENERATED_MAN_PAGES)         \
-            $(SETUP_MAN_PAGES)
- 
-@@ -51,24 +51,29 @@ CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \
-              $(doomdocs_DATA) $(hereticdocs_DATA) \
-              $(hexendocs_DATA) $(strifedocs_DATA)
- DOCGEN = $(srcdir)/docgen
-+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@"
- 
- $(SETUP_MAN_PAGES): chocolate-setup.6
- 	cp $(srcdir)/chocolate-setup.6 $@
- 
- @PROGRAM_PREFIX@doom.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
--	$(DOCGEN) -g doom -m $(srcdir)/doom.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g doom -m $(srcdir)/doom.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/doom > $@
- 
- default.cfg.5: $(top_srcdir)/src $(srcdir)/default.cfg.template
--	$(DOCGEN) -g doom -m $(srcdir)/default.cfg.template \
--                 -c default $(top_srcdir)/src/m_config.c > $@
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g doom -m $(srcdir)/default.cfg.template \
-+                  -c default $(top_srcdir)/src/m_config.c > $@
- 
- @PROGRAM_PREFIX@doom.cfg.5: $(top_srcdir)/src extra.cfg.template
--	$(DOCGEN) -g doom -m $(srcdir)/extra.cfg.template \
--                 -c extended $(top_srcdir)/src/m_config.c > $@
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g doom -m $(srcdir)/extra.cfg.template \
-+                  -c extended $(top_srcdir)/src/m_config.c > $@
- 
- CMDLINE.doom : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/doom
--	$(DOCGEN) -p $(srcdir)/CMDLINE.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -p $(srcdir)/CMDLINE.template \
-                   $(top_srcdir)/src/ $(top_srcdir)/src/doom/ > $@
- 
- INSTALL.doom: INSTALL.template
-@@ -76,19 +81,23 @@ INSTALL.doom: INSTALL.template
- 
- 
- @PROGRAM_PREFIX@heretic.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES) heretic.template
--	$(DOCGEN) -g heretic -m $(srcdir)/heretic.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g heretic -m $(srcdir)/heretic.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
- 
- heretic.cfg.5: $(top_srcdir)/src $(srcdir)/default.cfg.template
--	$(DOCGEN) -g heretic -m $(srcdir)/default.cfg.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g heretic -m $(srcdir)/default.cfg.template \
-                   -c default $(top_srcdir)/src/m_config.c > $@
- 
- @PROGRAM_PREFIX@heretic.cfg.5: $(top_srcdir)/src extra.cfg.template
--	$(DOCGEN) -g heretic -m $(srcdir)/extra.cfg.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g heretic -m $(srcdir)/extra.cfg.template \
-                  -c extended $(top_srcdir)/src/m_config.c > $@
- 
- CMDLINE.heretic : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/heretic
--	$(DOCGEN) -p $(srcdir)/CMDLINE.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -p $(srcdir)/CMDLINE.template \
-                   $(top_srcdir)/src/ $(top_srcdir)/src/heretic/ > $@
- 
- INSTALL.heretic: INSTALL.template
-@@ -96,19 +105,23 @@ INSTALL.heretic: INSTALL.template
- 
- 
- @PROGRAM_PREFIX@hexen.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
--	$(DOCGEN) -g hexen -m $(srcdir)/hexen.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g hexen -m $(srcdir)/hexen.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
- 
- hexen.cfg.5: $(top_srcdir)/src default.cfg.template
--	$(DOCGEN) -g hexen -m $(srcdir)/default.cfg.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g hexen -m $(srcdir)/default.cfg.template \
-                  -c default $(top_srcdir)/src/m_config.c > $@
- 
- @PROGRAM_PREFIX@hexen.cfg.5: $(top_srcdir)/src extra.cfg.template
--	$(DOCGEN) -g hexen -m $(srcdir)/extra.cfg.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                 -g hexen -m $(srcdir)/extra.cfg.template \
-                  -c extended $(top_srcdir)/src/m_config.c > $@
- 
- CMDLINE.hexen : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/hexen
--	$(DOCGEN) -p $(srcdir)/CMDLINE.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -p $(srcdir)/CMDLINE.template \
-                   $(top_srcdir)/src/ $(top_srcdir)/src/hexen/ > $@
- 
- INSTALL.hexen: INSTALL.template
-@@ -116,19 +129,28 @@ INSTALL.hexen: INSTALL.template
- 
- 
- @PROGRAM_PREFIX@strife.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
--	$(DOCGEN) -g strife -m $(srcdir)/strife.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g strife -m $(srcdir)/strife.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/strife > $@
- 
-+@PROGRAM_PREFIX@server.6: $(top_srcdir)/src $(MANPAGE_GEN_FILES)
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g server -m $(srcdir)/server.template \
-+                  $(top_srcdir)/src > $@
-+
- strife.cfg.5: $(top_srcdir)/src default.cfg.template
--	$(DOCGEN) -g strife -m $(srcdir)/default.cfg.template \
--                 -c default $(top_srcdir)/src/m_config.c > $@
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g strife -m $(srcdir)/default.cfg.template \
-+                  -c default $(top_srcdir)/src/m_config.c > $@
- 
- @PROGRAM_PREFIX@strife.cfg.5: $(top_srcdir)/src extra.cfg.template
--	$(DOCGEN) -g strife -m $(srcdir)/extra.cfg.template \
--                 -c extended $(top_srcdir)/src/m_config.c > $@
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g strife -m $(srcdir)/extra.cfg.template \
-+                  -c extended $(top_srcdir)/src/m_config.c > $@
- 
- CMDLINE.strife : CMDLINE.template $(top_srcdir)/src $(top_srcdir)/src/strife
--	$(DOCGEN) -p $(srcdir)/CMDLINE.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -p $(srcdir)/CMDLINE.template \
-                   $(top_srcdir)/src/ $(top_srcdir)/src/strife/ > $@
- 
- INSTALL.strife: INSTALL.template
-diff --git a/man/bash-completion/Makefile.am b/man/bash-completion/Makefile.am
-index 2c036acf..801dd212 100644
---- a/man/bash-completion/Makefile.am
-+++ b/man/bash-completion/Makefile.am
-@@ -19,21 +19,26 @@ CLEANFILES = $(BASH_COMPLETION_SCRIPTLETS)
- 
- MANDIR = $(top_srcdir)/man
- DOCGEN = $(MANDIR)/docgen
-+DOCGEN_COMMON_ARGS = -n "@PROGRAM_SPREFIX@" -s "@PACKAGE_NAME@"
- 
- @PROGRAM_PREFIX@doom: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
--	$(DOCGEN) -g doom -b $(MANDIR)/doom.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g doom -b $(MANDIR)/doom.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/doom > $@
- 
- @PROGRAM_PREFIX@heretic: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
--	$(DOCGEN) -g heretic -b $(MANDIR)/heretic.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g heretic -b $(MANDIR)/heretic.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
- 
- @PROGRAM_PREFIX@hexen: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
--	$(DOCGEN) -g hexen -b $(MANDIR)/hexen.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g hexen -b $(MANDIR)/hexen.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
- 
- @PROGRAM_PREFIX@strife: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
--	$(DOCGEN) -g strife -b $(MANDIR)/strife.template \
-+	$(DOCGEN) $(DOCGEN_COMMON_ARGS) \
-+                  -g strife -b $(MANDIR)/strife.template \
-                   $(top_srcdir)/src $(top_srcdir)/src/strife > $@
- 
- EXTRA_DIST = \
-diff --git a/man/chocolate-setup.6 b/man/chocolate-setup.6
-index 21c9d5d4..64f65937 100644
---- a/man/chocolate-setup.6
-+++ b/man/chocolate-setup.6
-@@ -1,20 +1,20 @@
--.TH chocolate\-setup 6
-+.TH @PROGRAM_SPREFIX@\-setup 6
- .SH NAME
--chocolate\-setup \- configuration tool for chocolate\-doom
-+@PROGRAM_SPREFIX@\-setup \- configuration tool for @PROGRAM_SPREFIX@\-doom
- .SH SYNOPSIS
--.B chocolate\-setup
-+.B @PROGRAM_SPREFIX@\-setup
- [OPTIONS]
- .SH DESCRIPTION
- .PP
--Chocolate Doom is a modern Doom engine designed to behave
-+@PACKAGE_NAME@ is a modern Doom engine designed to behave
- as similar to the original Doom game as is possible.
- .PP
--.B chocolate\-setup
--is a tool for configuring Chocolate Doom. It provides a menu\-based
-+.B @PROGRAM_SPREFIX@\-setup
-+is a tool for configuring @PACKAGE_NAME@. It provides a menu\-based
- interface for the display, joystick, keyboard, mouse, sound and
- compatibility settings.
- .PP
--.B chocolate\-setup
-+.B @PROGRAM_SPREFIX@\-setup
- can also be used to start and join network games.
- .PP
- .SH OPTIONS
-@@ -23,15 +23,15 @@ can also be used to start and join network games.
- Load configuration from the specified file, instead of default.cfg. 
- .TP
- \fB-extraconfig <file>\fR
--Load extra configuration from the specified file, instead of chocolate-doom.cfg. 
-+Load extra configuration from the specified file, instead of @PROGRAM_SPREFIX@\-doom.cfg. 
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
-+\fB@CHOCOLATE_SPREFIX@\-doom\fR(6),
- \fBdefault.cfg\fR(5),
--\fBchocolate-doom.cfg\fR(5)
-+\fB@CHOCOLATE_SPREFIX@\-doom.cfg\fR(5)
- .SH AUTHOR
- Chocolate Doom is written and maintained by Simon Howard.
- .PP
--This manual was written by Jon Dowland.
-+This manual was written by Jonathan Dowland.
- .SH COPYRIGHT
- Copyright \(co id Software Inc.
- Copyright \(co 2005-8 Simon Howard.
-diff --git a/man/default.cfg.template b/man/default.cfg.template
-index 5cf6256f..70c0d657 100644
---- a/man/default.cfg.template
-+++ b/man/default.cfg.template
-@@ -1,21 +1,21 @@
- .TH default.cfg 5
- .SH NAME
--default.cfg \- Chocolate Doom configuration file
-+default.cfg \- @PACKAGE_NAME@ configuration file
- .SH DESCRIPTION
- .PP
- \fIdefault.cfg\fR
--is the configuration file for \fBchocolate-doom\fR(6).  The configuration
-+is the configuration file for \fB@PROGRAM_SPREFIX@\-doom\fR(6).  The configuration
- options stored in the file are the same as those stored in the
- original DOS Vanilla Doom. 
--Extra Chocolate Doom-specific options are stored in a separate 
--configuration file, \fBchocolate-doom.cfg\fR.
-+Extra @PACKAGE_NAME@-specific options are stored in a separate 
-+configuration file, \fB@PROGRAM_SPREFIX@\-doom.cfg\fR.
- .PP
- \fIdefault.cfg\fR is normally stored in the user's home directory,
--as \fI~/.local/share/chocolate-doom/default.cfg\fR.  The path can be
-+as \fI~/.local/share/@PROGRAM_SPREFIX@\-doom/default.cfg\fR.  The path can be
- overridden using the \fBXDG_DATA_HOME\fR environment variable (see the XDG
- Base Directory Specification).
- .PP
--The \fBchocolate-setup\fR(6) tool provides a simple to use front-end
-+The \fB@PROGRAM_SPREFIX@\-setup\fR(6) tool provides a simple to use front-end
- for editing \fIdefault.cfg\fR.
- .br
- .SH FILE FORMAT
-@@ -49,7 +49,7 @@ indicating "false" and a non-zero value indicating "true".
- @content
- 
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
--\fBchocolate-doom.cfg\fR(5),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@\-doom.cfg\fR(5),
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
- 
-diff --git a/man/docgen b/man/docgen
-index e477e74e..defb9060 100755
---- a/man/docgen
-+++ b/man/docgen
-@@ -430,7 +430,7 @@ def process_files(path):
- 
-         process_file(path)
- 
--def print_template(template_file, content):
-+def print_template(template_file, program_prefix, package_name, content):
-     f = io.open(template_file, encoding='UTF-8')
- 
-     try:
-@@ -440,14 +440,16 @@ def print_template(template_file, content):
-                 filename = match.group(1)
-                 filename = os.path.join(os.path.dirname(template_file),
-                                         filename)
--                print_template(filename, content)
-+                print_template(filename, program_prefix, package_name, content)
-             else:
-                 line = line.replace("@content", content)
-+                line = line.replace("@PROGRAM_SPREFIX@", program_prefix)
-+                line = line.replace("@PACKAGE_SHORTNAME@", package_name)
-                 stdout(line.rstrip().encode('UTF-8') + b'\n')
-     finally:
-         f.close()
- 
--def manpage_output(targets, template_file):
-+def manpage_output(targets, program_prefix, package_name, template_file):
- 
-     content = ""
- 
-@@ -456,7 +458,7 @@ def manpage_output(targets, template_file):
- 
-     content = content.replace("-", "\\-")
- 
--    print_template(template_file, content)
-+    print_template(template_file, program_prefix, package_name, content)
- 
- def wiki_output(targets, template):
-     read_wikipages()
-@@ -464,29 +466,31 @@ def wiki_output(targets, template):
-     for t in targets:
-         stdout(t.wiki_output().encode('UTF-8') + b'\n')
- 
--def plaintext_output(targets, template_file):
-+def plaintext_output(targets, program_prefix, package_name, template_file):
- 
-     content = ""
- 
-     for t in targets:
-         content += t.plaintext_output() + "\n"
- 
--    print_template(template_file, content)
-+    print_template(template_file, program_prefix, package_name, content)
- 
--def completion_output(targets, template_file):
-+def completion_output(targets, program_prefix, package_name, template_file):
- 
-     content = ""
- 
-     for t in targets:
-         content += t.completion_output() + "\n"
- 
--    print_template(template_file, content)
-+    print_template(template_file, program_prefix, package_name, content)
- 
- def usage():
--    print("Usage: %s [-V] [-c tag] [-g game] ( -m | -w | -p ) <dir>..." \
-+    print("Usage: %s [-V] [-c tag] [-g game] -n name ( -m | -w | -p ) <dir>..." \
-             % sys.argv[0])
-     print("   -c :  Provide documentation for the specified configuration file")
-     print("         (matches the given tag name in the source file)")
-+    print("   -s :  Package name (for substitution)")
-+    print("   -n :  Program name (for substitution)")
-     print("   -m :  Manpage output")
-     print("   -w :  Wikitext output")
-     print("   -p :  Plaintext output")
-@@ -497,14 +501,20 @@ def usage():
- 
- # Parse command line
- 
--opts, args = getopt.getopt(sys.argv[1:], "m:wp:b:c:g:V")
-+opts, args = getopt.getopt(sys.argv[1:], "n:s:m:wp:b:c:g:V")
- 
- output_function = None
- template = None
- doc_config_file = None
- match_game = None
-+program_prefix = None
-+package_name = None
- 
- for opt in opts:
-+    if opt[0] == "-n":
-+        program_prefix = opt[1]
-+    if opt[0] == "-s":
-+        package_name = opt[1]
-     if opt[0] == "-m":
-         output_function = manpage_output
-         template = opt[1]
-@@ -546,5 +556,5 @@ else:
- 
-     # Generate the output
- 
--    output_function(documentation_targets, template)
-+    output_function(documentation_targets, program_prefix, package_name, template)
- 
-diff --git a/man/doom.template b/man/doom.template
-index 845147a8..da8d2141 100644
---- a/man/doom.template
-+++ b/man/doom.template
-@@ -1,35 +1,35 @@
--.TH chocolate\-doom 6
-+.TH @PROGRAM_SPREFIX@\-doom 6
- .SH NAME
--chocolate\-doom \- historically compatible Doom engine
-+@PROGRAM_SPREFIX@\-doom \- historically compatible Doom engine
- .SH SYNOPSIS
--.B chocolate\-doom
-+.B @PROGRAM_SPREFIX@\-doom
- [\fIOPTIONS\fR]
- .SH DESCRIPTION
- .PP
--Chocolate Doom is a port of Id Software's 1993 game "Doom" that is designed
-+@PACKAGE_NAME@ is a port of Id Software's 1993 game "Doom" that is designed
- to behave as similar to the original DOS version of Doom as is possible.
- .br
- @content
- .SH IWAD SEARCH PATHS
- @include iwad_paths.man
- .SH ENVIRONMENT
--This section describes environment variables that control Chocolate Doom's
-+This section describes environment variables that control @PACKAGE_NAME@'s
- behavior.
- @include environ.man
- .SH FILES
- .TP
--\fB$HOME/.local/share/chocolate-doom/default.cfg\fR
--The main configuration file for Chocolate Doom.  See \fBdefault.cfg\fR(5).
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/default.cfg\fR
-+The main configuration file for @PACKAGE_NAME@.  See \fBdefault.cfg\fR(5).
- .TP
--\fB$HOME/.local/share/chocolate-doom/chocolate-doom.cfg\fR
--Extra configuration values that are specific to Chocolate Doom and not
--present in Vanilla Doom.  See \fBchocolate-doom.cfg\fR(5).
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-doom.cfg\fR
-+Extra configuration values that are specific to @PACKAGE_NAME@ and not
-+present in Vanilla Doom.  See \fB@PROGRAM_SPREFIX@\-doom.cfg\fR(5).
- .SH SEE ALSO
--\fBchocolate-server\fR(6),
--\fBchocolate-setup\fR(6),
--\fBchocolate-heretic\fR(6),
--\fBchocolate-hexen\fR(6),
--\fBchocolate-strife\fR(6)
-+\fB@PROGRAM_SPREFIX@\-server\fR(6),
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6),
-+\fB@PROGRAM_SPREFIX@\-heretic\fR(6),
-+\fB@PROGRAM_SPREFIX@\-hexen\fR(6),
-+\fB@PROGRAM_SPREFIX@\-strife\fR(6)
- .SH AUTHOR
- Chocolate Doom is written and maintained by Simon Howard.  It is based on
- the LinuxDoom source code, released by Id Software.
-diff --git a/man/extra.cfg.template b/man/extra.cfg.template
-index b9317c53..77cc0dd3 100644
---- a/man/extra.cfg.template
-+++ b/man/extra.cfg.template
-@@ -1,23 +1,23 @@
--.TH chocolate-doom.cfg 5
-+.TH @PROGRAM_SPREFIX@\-doom.cfg 5
- .SH NAME
--chocolate-doom.cfg \- Chocolate Doom configuration file
-+@PROGRAM_SPREFIX@\-doom.cfg \- @PACKAGE_NAME@ configuration file
- .SH DESCRIPTION
- .PP
--\fIchocolate-doom.cfg\fR
--is a configuration file for \fBchocolate-doom\fR(6).  This file acts
-+\fI@PROGRAM_SPREFIX@\-doom.cfg\fR
-+is a configuration file for \fB@PROGRAM_SPREFIX@\-doom\fR(6).  This file acts
- as an auxiliary configuration file; the main configuration options
- are stored in \fBdefault.cfg\fR, which contains the same configuration
--options as Vanilla Doom (for compatibility).  \fIchocolate-doom.cfg\fR
--contains configuration options that are specific to Chocolate Doom
-+options as Vanilla Doom (for compatibility).  \fI@PROGRAM_SPREFIX@\-doom.cfg\fR
-+contains configuration options that are specific to @PACKAGE_NAME@
- only.
- .PP
--\fIchocolate-doom.cfg\fR is normally stored in the user's home directory,
--as \fI~/.local/share/chocolate-doom/chocolate-doom.cfg\fR.  The path can be
-+\fI@PROGRAM_SPREFIX@\-doom.cfg\fR is normally stored in the user's home directory,
-+as \fI~/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-doom.cfg\fR.  The path can be
- overridden using the \fBXDG_DATA_HOME\fR environment variable (see the XDG
- Base Directory Specification).
- .PP
--The \fBchocolate-setup\fR(6) tool provides a simple to use front-end
--for editing \fIchocolate-doom.cfg\fR.
-+The \fB@PROGRAM_SPREFIX@\-setup\fR(6) tool provides a simple to use front-end
-+for editing \fI@PROGRAM_SPREFIX@\-doom.cfg\fR.
- .SH FILE FORMAT
- .PP
- The file format is the same as that used for \fBdefault.cfg\fR(5).
-@@ -26,7 +26,7 @@ The file format is the same as that used for \fBdefault.cfg\fR(5).
- @content
- 
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
- \fBdefault.cfg\fR(5),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
- 
-diff --git a/man/heretic.template b/man/heretic.template
-index 944d4a83..c078c7c6 100644
---- a/man/heretic.template
-+++ b/man/heretic.template
-@@ -1,8 +1,8 @@
--.TH chocolate\-heretic 6
-+.TH @PROGRAM_SPREFIX@\-heretic 6
- .SH NAME
--chocolate\-heretic \- historically compatible Heretic engine
-+@PROGRAM_SPREFIX@\-heretic \- historically compatible Heretic engine
- .SH SYNOPSIS
--.B chocolate\-heretic
-+.B @PROGRAM_SPREFIX@\-heretic
- [\fIOPTIONS\fR]
- .SH DESCRIPTION
- .PP
-@@ -19,17 +19,17 @@ behavior.
- @include environ.man
- .SH FILES
- .TP
--\fB$HOME/.local/share/chocolate-doom/heretic.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/heretic.cfg\fR
- The main configuration file for Chocolate Heretic.  See \fBheretic.cfg\fR(5).
- .TP
--\fB$HOME/.local/share/chocolate-doom/chocolate-heretic.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-heretic.cfg\fR
- Extra configuration values that are specific to Chocolate Heretic and not
--present in Vanilla Heretic. See \fBchocolate-heretic.cfg\fR(5).
-+present in Vanilla Heretic. See \fB@PROGRAM_SPREFIX@\-heretic.cfg\fR(5).
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
--\fBchocolate-hexen\fR(6),
--\fBchocolate-server\fR(6),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@\-hexen\fR(6),
-+\fB@PROGRAM_SPREFIX@\-server\fR(6),
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
- .SH AUTHOR
- Chocolate Heretic is part of the Chocolate Doom project, written and
- maintained by Simon Howard. It is based on the Heretic source code,
-diff --git a/man/hexen.template b/man/hexen.template
-index 7772b1d4..9184a27e 100644
---- a/man/hexen.template
-+++ b/man/hexen.template
-@@ -1,8 +1,8 @@
--.TH chocolate\-hexen 6
-+.TH @PROGRAM_SPREFIX@\-hexen 6
- .SH NAME
--chocolate\-hexen \- historically compatible Hexen engine
-+@PROGRAM_SPREFIX@\-hexen \- historically compatible Hexen engine
- .SH SYNOPSIS
--.B chocolate\-hexen
-+.B @PROGRAM_SPREFIX@\-hexen
- [\fIOPTIONS\fR]
- .SH DESCRIPTION
- .PP
-@@ -19,17 +19,17 @@ behavior.
- @include environ.man
- .SH FILES
- .TP
--\fB$HOME/.local/share/chocolate-doom/hexen.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/hexen.cfg\fR
- The main configuration file for Chocolate Hexen.  See \fBhexen.cfg\fR(5).
- .TP
--\fB$HOME/.local/share/chocolate-doom/chocolate-hexen.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-hexen.cfg\fR
- Extra configuration values that are specific to Chocolate Hexen and not
--present in Vanilla Hexen.  See \fBchocolate-hexen.cfg\fR(5).
-+present in Vanilla Hexen.  See \fB@PROGRAM_SPREFIX@\-hexen.cfg\fR(5).
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
--\fBchocolate-heretic\fR(6),
--\fBchocolate-server\fR(6),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@\-heretic\fR(6),
-+\fB@PROGRAM_SPREFIX@\-server\fR(6),
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
- .SH AUTHOR
- Chocolate Hexen is part of the Chocolate Doom project, written and
- maintained by Simon Howard. It is based on the Hexen source code,
-diff --git a/man/chocolate-server.6 b/man/server.template
-similarity index 74%
-rename from man/chocolate-server.6
-rename to man/server.template
-index 74dc6f42..643779f6 100644
---- a/man/chocolate-server.6
-+++ b/man/server.template
-@@ -1,18 +1,18 @@
--.TH chocolate\-server 6
-+.TH @PROGRAM_SPREFIX@\-server 6
- .SH NAME
--chocolate\-server \- dedicated server for chocolate\-doom
-+@PROGRAM_SPREFIX@\-server \- dedicated server for @PROGRAM_SPREFIX@\-doom
- .SH SYNOPSIS
--.B chocolate\-server
-+.B @PROGRAM_SPREFIX@\-server
- [OPTIONS]
- .SH DESCRIPTION
- .PP
--Chocolate Doom is a modern doom engine designed to behave
-+@PACKAGE_SHORTNAME@ is a modern doom engine designed to behave
- as similar to the original doom game as is possible.
- .PP
--.B chocolate\-server
--is a dedicated server for Chocolate Doom. It is equivalent to 
-+.B @PROGRAM_SPREFIX@\-server
-+is a dedicated server for @PACKAGE_SHORTNAME@. It is equivalent to 
- running 
--.B chocolate\-doom
-+.B @PROGRAM_SPREFIX@\-doom
- with the "\-dedicated" option.
- .PP
- Game options are not specified to the server, which merely acts to
-@@ -36,12 +36,12 @@ Don't register with the global master server.
- \fB-servername <name>\fR
- Specify a name for the server.
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@-setup\fR(6)
- .SH AUTHOR
- Chocolate Doom is written and maintained by Simon Howard.
- .PP
--This manual was written by Jon Dowland.
-+This manual was written by Jonathan Dowland.
- .SH COPYRIGHT
- Copyright \(co id Software Inc.
- Copyright \(co 2005-8 Simon Howard.
-diff --git a/man/strife.template b/man/strife.template
-index d616c17b..9ca7f14e 100644
---- a/man/strife.template
-+++ b/man/strife.template
-@@ -1,8 +1,8 @@
--.TH chocolate\-strife 6
-+.TH @PROGRAM_SPREFIX@\-strife 6
- .SH NAME
--chocolate\-strife \- historically compatible strife engine
-+@PROGRAM_SPREFIX@\-strife \- historically compatible Strife engine
- .SH SYNOPSIS
--.B chocolate\-strife
-+.B @PROGRAM_SPREFIX@\-strife
- [\fIOPTIONS\fR]
- .SH DESCRIPTION
- .PP
-@@ -22,16 +22,16 @@ behavior.
- 
- .SH FILES
- .TP
--\fB$HOME/.local/share/chocolate-doom/strife.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/strife.cfg\fR
- The main configuration file for Chocolate Strife.  See \fBstrife.cfg\fR(5).
- .TP
--\fB$HOME/.local/share/chocolate-doom/chocolate-strife.cfg\fR
-+\fB$HOME/.local/share/@PROGRAM_SPREFIX@\-doom/@PROGRAM_SPREFIX@\-strife.cfg\fR
- Extra configuration values that are specific to Chocolate Strife and not
--present in Vanilla Strife.  See \fBchocolate-strife.cfg\fR(5).
-+present in Vanilla Strife.  See \fB@PROGRAM_SPREFIX@\-strife.cfg\fR(5).
- .SH SEE ALSO
--\fBchocolate-doom\fR(6),
--\fBchocolate-server\fR(6),
--\fBchocolate-setup\fR(6)
-+\fB@PROGRAM_SPREFIX@\-doom\fR(6),
-+\fB@PROGRAM_SPREFIX@\-server\fR(6),
-+\fB@PROGRAM_SPREFIX@\-setup\fR(6)
- 
- .SH HISTORY
- The source code for Strife was lost, which means, unlike the code for all the
--- 
-2.26.2
-
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 38063061c2c9..b19766562bd4 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 63e866497544..61c4d9f48ab7 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,2 +1,2 @@
-DIST pyfa-2.24.1.tar.gz 12648921 BLAKE2B 5715d81144df32cad83eb21d7f8800eb9773139e9305402a5096c585362fcabd0d705529a8887a8c8092637b8348d2a7e8a77e1f6eb362fd83ea39a86203ccb4 SHA512 ffe8a6e9c9c9b593516d9ba76ccb9e69788124132de642f45f5527468645d46f75e4c2388bb5f01788eb85f3e535ade110cfffc92c2943d96f477b5652528328
 DIST pyfa-2.28.3.tar.gz 12685191 BLAKE2B b73663479e39f8948de0ad0de3edb3a89b65bb5b6640332e8fed39f33b222fbc0f4b47487112b01895413fa751ee8dabcde2083a3f3a6b90fe0ad72b24165434 SHA512 7e432658eedb8dfbc9cd41d3ab7da3bf1d411e6935ad56434af1551eeae4de803f3d5447bff4fd5d569d20f1f3eca9acaa1ac22c163bec1ac7720807643b4187
+DIST pyfa-2.29.0.tar.gz 12631717 BLAKE2B 5999c82f090d36355188601158c648112b5d194066b193080260d609e3edbecba4078d9a02ebdfaa6561f555e3876833b20f81b0992e95f4efd0dc632563c95f SHA512 2d7945c7d93a358ab06de554bd6a7f359934a8508cb828d5a4c4c47e743217560083ed16dc91e8c7f0f14f7aec96ec2c7965bae51b687a8e63558365628c0d43
diff --git a/games-util/pyfa/pyfa-2.24.1.ebuild b/games-util/pyfa/pyfa-2.29.0.ebuild
similarity index 94%
rename from games-util/pyfa/pyfa-2.24.1.ebuild
rename to games-util/pyfa/pyfa-2.29.0.ebuild
index 00faae6993c0..50ffcdd37c25 100644
--- a/games-util/pyfa/pyfa-2.24.1.ebuild
+++ b/games-util/pyfa/pyfa-2.29.0.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 
-inherit desktop eutils python-single-r1 xdg-utils
+inherit desktop edos2unix python-single-r1 xdg
 
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
 HOMEPAGE="https://github.com/pyfa-org/Pyfa"
@@ -76,7 +76,7 @@ src_install() {
 	insinto /usr/share/${PN}
 
 	einfo "Creating database ..."
-	python ./db_update.py || die
+	${EPYTHON} ./db_update.py || die
 	doins eve.db
 
 	einfo "Compressing images ..."
@@ -90,11 +90,3 @@ src_install() {
 	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
 	domenu "${FILESDIR}/${PN}.desktop"
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 8db7ceaac397..86b2aa7584c8 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 4142cf3e5299..c3d5e02ac2c3 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1 @@
-DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e SHA512 5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d
 DIST kdiff3-1.8.4.tar.xz 1040492 BLAKE2B 4598a5db318821af085c19983f17260969220bf7352fc961b8e49237c6818b5f723cebac8190ceb591f2cd3ad54b52b9f7bb91be91ce90c399ad959398e64f1e SHA512 100632f7656e53f567faec8efea1aba132916e7b6c9569b2bacb7da1081f1dd126e27825663fb860f3d40cb205cf3c1817dd28ea560b9e650b5002e3d89dd9d8
diff --git a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
index 7b3bf740d42b..17ffac0a4a65 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index f715b112eb60..a514ca09b879 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 7eb2e15be921..404de2830b6f 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1 +1,2 @@
 DIST bluedevil-5.19.5.tar.xz 168480 BLAKE2B 2fd4447dde007540e3cbfc0994cc257cf777088582c27bb3af123df3085138496f33ce4cf9c403944de1f012cfbae6e7d72058d9536c00ef735c071da7d20fe6 SHA512 152702f37e46b3b359ff23705dcf347588691d87e1a0cbce940ef557f29e92fd9e129724ab37158b4daa00fdd38d31ad5197318dc09b33d7c834e562b6aff5dd
+DIST bluedevil-5.20.0.tar.xz 154604 BLAKE2B 6b81b607fb8b6baf5e6643ca879881ffbda2c5e93fb30c47aa63449a8cc1c7399143d667511eabd138da215650159f8f9a7613eae56b6790fd6ea676f763fdfe SHA512 38a2703b9a5407166aba7227612cd861f473688a883dfaf9276c0809ec717f15c6cc2493bd7bcb2255f42a79edf1dd266ddcd20647897ee657452ae138af46dc
diff --git a/kde-plasma/bluedevil/bluedevil-5.20.0.ebuild b/kde-plasma/bluedevil/bluedevil-5.20.0.ebuild
new file mode 100644
index 000000000000..43cb1b825bc1
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.20.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/bluez-qt-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index c84d987ba091..c608aff5de23 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1 +1,2 @@
 DIST breeze-grub-5.19.5.tar.xz 3145156 BLAKE2B 5d18ed9699fe1fd5e0d3a94263c25692f4f933066de9b43098f70051dddb11fbead60032c9d28b3fb5960b7f05dc1a2d4aaf6ffe80fb203394d568f09d421772 SHA512 db589b3f8daf4518b517b74110b925319b610251e002c3e28fdd2e0a88d99c2d3108dbbe02257a60bb4b6a3e4b594febf26f7d2448ec1caeaf341d95cd02c0e3
+DIST breeze-grub-5.20.0.tar.xz 3142068 BLAKE2B 5a6981960e7c7fb18f1c9eedc7b098a1f58bd48e34230c3743bab1eda1fffb9aadb2ea750e0f37b59edee2fd430d1921bce9822121b0c242131a8190d5544a55 SHA512 0954036373179357a6c32c47725a119964c94b808ef5b3325cea79ddc7f2decf2b5e7ce02421b258884b03b708a3e30adcdd212fae6e30cae23f49e1c783b558
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.20.0.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.20.0.ebuild
new file mode 100644
index 000000000000..6ba651f29041
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.20.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+inherit kde.org
+
+DESCRIPTION="Breeze theme for GRUB"
+
+LICENSE="GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+src_prepare() { default; }
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/grub/themes
+	doins -r breeze
+}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 7955c2ef4435..0c07c4dfdf5b 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1 +1,2 @@
 DIST breeze-gtk-5.19.5.tar.xz 42576 BLAKE2B 8874a468666d17318a2fc06ab6dad66e4a6e648bc46479b019e7ead84b29185f8dd334801231b2890c6aec3821172871ce4d9859daf6fd6e83bde23fc7ebc4df SHA512 cb201730ba20745cdf04e8889830e1a5f6ac530435783ca1c01c52d456c650a88f459c871fb6e6b4ef36bc771dbaa4e2d03d7ad08906c910b7b9849678bf9f2f
+DIST breeze-gtk-5.20.0.tar.xz 43060 BLAKE2B 01d80696ca6d64dca5cd4f2602fd50d8d3ab2052bc1e9be8b6508dcaefd14b6f6efb36dfaabfbd1146e8d574295bc4557aa0847e5f53497b2d45577688d1153c SHA512 0eabe2961a6c78872bc0e4f6fb2e453d6686ba5b6abb0989e0b721fe9c87792172f25bf7afd3b3d8b3e31d1462348b0a6ad9a735d9d45577de089dc72cb80076
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.20.0.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.20.0.ebuild
new file mode 100644
index 000000000000..90808546c3ae
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.20.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org python-any-r1
+
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
+HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/sassc
+	>=dev-util/cmake-3.16
+	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
+	>=kde-plasma/breeze-${PVCUT}:5
+"
+
+python_check_deps() {
+	has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 1b93424c8f9b..a12b3e345fa6 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1 +1,2 @@
 DIST breeze-plymouth-5.19.5.tar.xz 105732 BLAKE2B a9d0cb4e34f3d5f9bb7229c3b29074765fadcf54424562d7c91b4f56233d130efebfbd263e65b4013da2a3da1b59b7da6d77e728661d1ea5d965c413cb558e10 SHA512 8f0739379c2ddb62b612acf65c41bee57e36d98a120289a1db3245467d118e18f3c0fe67905d990c586dfbe333c47f8671893726ad5ee9c28883d938e309963d
+DIST breeze-plymouth-5.20.0.tar.xz 108776 BLAKE2B 83a778087ac7d7aed814a61eca44f281e77629766a7b127f626b8f37fc39eaf248cc862b28318a52c7a84471df3e855f100fe2c4f02cbcae1c756fdd94653abb SHA512 ba268f4971cf17311b78d0b1a977e6795221638258dbf9cfe99eb988d1c320d135d5efc7eab057ac6bfac620149db52b32edf074cba07c816a67b0a83e558183
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.0.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.0.ebuild
new file mode 100644
index 000000000000..ecef97101572
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+inherit cmake kde.org
+
+DESCRIPTION="Breeze theme for Plymouth"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
+DEPEND="sys-boot/plymouth"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISTRO_NAME="Gentoo Linux"
+		-DDISTRO_VERSION=
+	)
+
+	cmake_src_configure
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 3eec84b5f185..3932196eb65d 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1 +1,2 @@
 DIST breeze-5.19.5.tar.xz 22761136 BLAKE2B 379a26d103acc718281f7ccdc6d66539c78d77ca9bcbbb0d3c9d86625a4d053f1772b49584a179d38d1c00e14441695b717405898ca6ed9ce0c6e947e93ac172 SHA512 6b67b147c34e3b143e0c4c400eb3133ab15b826f9046ad2e701114f3ceaa1e2d085d864f04c28f2bdc37464a2313c6d8b5983fab5ca9f22ccae90ef1528eb8c4
+DIST breeze-5.20.0.tar.xz 38490700 BLAKE2B a7cf458a6adc4eb20844f051a99c04b3a81a0410a97a4f04f9b12686dd71b0e99da42b88e73b4bb6638252e7cfbf23ca8a7f36eb0b238b71791212a6c3a936b3 SHA512 bb76c1b60ce7ff7b8fbabda232d1d50fe86fc0e2d56ad7feadb582b89ec796851f97f3339c7423cbb6e14db2fe609aeb4f5d046a2f26f8c6fed2336de2d0a16a
diff --git a/kde-plasma/breeze/breeze-5.20.0.ebuild b/kde-plasma/breeze/breeze-5.20.0.ebuild
new file mode 100644
index 000000000000..8a94fe9a495f
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.20.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/breeze"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="wayland X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/frameworkintegration-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kpackage-${KFMIN}:5
+"
+PDEPEND="
+	>=kde-frameworks/breeze-icons-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X XCB)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 4498fdede108..422c38816cc5 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1 +1,2 @@
 DIST discover-5.19.5.tar.xz 10296324 BLAKE2B d19662ea90f8be4e090e62587ae79b19c072dfac28d90c2bc1476ff4e375498e938e0b76d02487e8cdc64e297193dc62bce34484f81122d827ae0fcc5070fc3f SHA512 524fc45331631a305620f05fe67f780aee2dba7714978f32d9baa0d488185da801ee7a4d11592f2e07dfe395726b0c34d4ae7dfe3abf2b0e7632bdea27a714fd
+DIST discover-5.20.0.tar.xz 10297808 BLAKE2B 0282d1b028731a738568adf79e9c21ab113adca25b37e1cf0eba2b66a8377fc08833f22655508b3ff887fe2a54145df9bc531e5087f97245dcc914ec2f82b675 SHA512 70bda593c21f2b1cd039e254847c00b488beb3f9fc5560bce245656c277a38bd4be25b065730f832b6bedcbd2213f1c8b751cc1f3959c14b4c6480cc06d015a2
diff --git a/kde-plasma/discover/discover-5.20.0.ebuild b/kde-plasma/discover/discover-5.20.0.ebuild
new file mode 100644
index 000000000000..ec442a29e005
--- /dev/null
+++ b/kde-plasma/discover/discover-5.20.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma resources management GUI"
+HOMEPAGE="https://userbase.kde.org/Discover"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+firmware telemetry"
+
+# libmarkdown (app-text/discount) only used in PackageKitBackend
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	firmware? ( sys-apps/fwupd )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# we don't need it with PackageKitBackend off
+	ecm_punt_bogus_dep KF5 Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+		-DBUILD_FlatpakBackend=OFF
+		-DBUILD_FwupdBackend=$(usex firmware)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 229c88bf378a..96f5cadc88c5 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1 +1,2 @@
 DIST drkonqi-5.19.5.tar.xz 744412 BLAKE2B 54840e9fab41f09c6184eb29e3e7bfb17d08a76966b7bb9776f1f044671c61073bd38ca4b8f96c6c3eb4a534871550363941cf2fd94a177f770caccec9a3339f SHA512 0dcfcb5018f1024ad751c234f7e67b865f06c8e8bf5a1a95a160df2af97730ca111f4cc8614da646c8dbe042a206d3d4be214790abcf617ca454582161f0aa24
+DIST drkonqi-5.20.0.tar.xz 746156 BLAKE2B e8640474d1a85d9518a59fd52faa8534c9d3a581b3d5b46a0791b20e9cc4457976e1b89f6f4e0294647ddb1782e1b523042e828d23a1044540a7edc7c59bad93 SHA512 81b3bde1a786b5a8d341a1af21c4f92ab20c758d0a3f2d5dadfb2d07556bb4582e7fa852082220535ed2dade7d2b0f65f1d154a671bb6667a29cff07f7a1a267
diff --git a/kde-plasma/drkonqi/drkonqi-5.20.0.ebuild b/kde-plasma/drkonqi/drkonqi-5.20.0.ebuild
new file mode 100644
index 000000000000..830deaf8d0ab
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.20.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# needs network access, bug #698510
+	local myctestargs=(
+		-E "(connectiontest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing the following package:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index f29c47e8b1c5..9107c403d8ad 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1 +1,2 @@
 DIST kactivitymanagerd-5.19.5.tar.xz 84996 BLAKE2B c5dd47d35fc1bcb5a1f64ed0a60d96f85398372d481927511269abe98512ba38c1128fde760dacbdf044dfca1b52eda68aa3558cab2b9238a0c957bb0edac009 SHA512 884f839c68b94da264042262b730baf81ca4b65320daa2b4de2ecba0698728600f25de77feeb6ef69bc9d98b06e827d8ce467fb9d7b54807442d7d9cf2b9b9a7
+DIST kactivitymanagerd-5.20.0.tar.xz 94596 BLAKE2B 25917510ffa3f53ce9287ce6f4eae52edd1ac6a89fc110ce44338f11c8f560e5eebf020ecc5440aaf81d3029a89b0408758ff9329987dbd3f08263a6f8e24da2 SHA512 f2f6664f511e397b3d246390175a7ae7d89a866076cff5833c97152212942165294cb7d224114a5a1b75ccb9c82402c4a3e16a0404e89390572497a34c711e4c
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.0.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.0.ebuild
new file mode 100644
index 000000000000..841f91604f6b
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 85b69a5d51b1..bcc0489e830c 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1 +1,2 @@
 DIST kde-cli-tools-5.19.5.tar.xz 600580 BLAKE2B bfe77d7d5d9528b3b7d089341afa1cf48bd05d2b82c596a85eddaa197ec9ddce4c83f223e6698979b10e764f4468b3a5bfc94777400d8aa927227cbd0508c975 SHA512 9e8de408643caad7c0de52cd348c35678c92b478587a2e7fd6b0cfd1d93dd578d9060c58b1dacf4b0143840d61860b51f41b53b7c2349112b855c9bad3c9b897
+DIST kde-cli-tools-5.20.0.tar.xz 597152 BLAKE2B de3544cab238a53bba98e500ca8194b1b0ddd81ce01b8a3ad771564bdb3ff6079f635957ab13cf7d92fb29e64ef1b181d59e64db3950cc339952228ff8191db4 SHA512 f3637edb92cf955e255d31bd857633716ac6072f2a2e0c95f070a2e91c83c624f1ea14e156c5b390dde48a4795bdafe412454b1c2dfeedd643cb8c91e2f23fd1
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.0.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.0.ebuild
new file mode 100644
index 000000000000..8f483a252e8e
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="kdesu X"
+
+REQUIRED_USE="kdesu? ( X )"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	kdesu? ( sys-apps/dbus[X] )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kdesu KF5Su)
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index acc3de056ed4..985c2b2431e4 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1 +1,2 @@
 DIST kde-gtk-config-5.19.5.tar.xz 26224 BLAKE2B c55e69d3447179817b0a152b837843f97eb3fdf7e337b1cdabcce4089532a23609777fb57aab1615aad70369d5a22b2707c5eaa10783500e3ae33d57cd868e2f SHA512 d9875fc1af767b7f318520f386a62404779c33312eb5bad1eebc924a36ca05d822cf219b56548cd050e0965b0dfd581b5fee533a77fb5d745e51f63b350ff79c
+DIST kde-gtk-config-5.20.0.tar.xz 68040 BLAKE2B 738e5e6d026c14fc461834bd60d6cfe0e0bea48cafa3bdda735bb025c862be1b5272b765a79308156f416f76a6001b3c25c0d94f3040c3d2479c028c94e26ef6 SHA512 04f1e3053b896e4c61d1e215b68c4eb97070d4062b1a394346d7236e1e80a6a8af080e970576af32498d5c74b63b21dafc9c12a92636ce6c03eac84442de0db1
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.0.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.0.ebuild
new file mode 100644
index 000000000000..f061fff0a222
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
+HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-lang/sassc
+"
+DEPEND="
+	dev-cpp/glibmm:2
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	gnome-base/gsettings-desktop-schemas
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	x11-misc/xsettingsd
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "If you notice missing icons in your GTK applications, you may have to install"
+	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+	elog "for example."
+}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 97274fcc1a5e..c6626212dac6 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1 +1,2 @@
 DIST kdecoration-5.19.5.tar.xz 43832 BLAKE2B 7d72c6014e6893f194c3c1faa2cab0cde122ed51e39006c95eda2bff247601e54d973cb2ad7ce6a92bc410db288396e279efb5b15c911d7008d47d566e9b504d SHA512 74ce5ed6a071ebc484103a2efbfbf3f2f624852dc00e141ced85813571bffb351f832dd6162c1c672274006c7bf2c7b64d59e5224f5eca6d17cd3e3a2e35151b
+DIST kdecoration-5.20.0.tar.xz 45680 BLAKE2B 28f6b7710e6ea186aa7980b2368515c3e7c877d0bfae7f4c15881788ef4a6d27508ab092c9e04f04902190f9e473fd47d79d3db3cf7954526828b8c80c1449fd SHA512 d0c50a45233ce11ca27a121f466e7cf6149368104025280874c11ee6adcc28a36be570979c0a7b89b66af174b302f132f44599a06783a5cb218c85610a87d946
diff --git a/kde-plasma/kdecoration/kdecoration-5.20.0.ebuild b/kde-plasma/kdecoration/kdecoration-5.20.0.ebuild
new file mode 100644
index 000000000000..e66f43ab382d
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.20.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plugin based library to create window decorations"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 1dbc943eaaa7..bf27ea5d9b05 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1 +1,2 @@
 DIST kdeplasma-addons-5.19.5.tar.xz 629136 BLAKE2B 992df5d362aca213531cb96b8d01a3c2792ed91562d4f6a7f71e8b50ba6ee28cbd6501b75c7c91923b6afcb13fdf1b385189f718d8cebb482d1cedd040f67d94 SHA512 93de717c623605ceb9fdcedecdf656030b6e9bc360ce834ea918403f64f250029e9a2406bddc0b324e4738006d4ca155bc509f4a7d40c073a2aefb2017db9731
+DIST kdeplasma-addons-5.20.0.tar.xz 626868 BLAKE2B 028335baaa23cadd09d90335b303984b5d226139ec8dde431dfef424e15a699f95f38843e7c5b8e2a00683dd15885c9a871311a2e99ffa7b175a3747eede4cd0 SHA512 45484ddb8ef8eee0a793ff3d57dfd3fd143c4892eff7224cec847fc7c11becc0f10b54bc8533d331bc504df75e8c31522064165dee08d8b60093dbe4c626472f
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.0.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.0.ebuild
new file mode 100644
index 000000000000..3f921c96d88c
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="comic share webengine"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" ) # downstream patch
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package comic KF5Kross)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Disk quota applet" sys-fs/quota
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 175c6ed15539..0995d097abbe 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1 +1,2 @@
 DIST kgamma5-5.19.5.tar.xz 80752 BLAKE2B 33280fb2b7856d7b6029e7c05323897a393ca2a1d86f8951327e237cdd29b22f07b64a46ffcaa78093866036c09324605b485fcc103e144b5aa9ee4116e1a338 SHA512 bb758ac5a4ed21563bcdad3eca07a822a8bdebe5d5cf4862f92f2b38dc9a8fc4b15b8cf0e96d6a329b969eb36064c8723ec432a044cecf1c25fe43853cb8f567
+DIST kgamma5-5.20.0.tar.xz 80952 BLAKE2B 2615fb31a77e4e572704f2b9025f61062b2ccb48aeb11890958e4b6f8d3bd3f7207f8c525d83945a43574d013c3464476cb729642a39992a1fa5eb8ff4e7ad57 SHA512 8681f10c9706f9e2da0262ad64cec5615e3894574116d37877dfb8fe82bf859e3bcba7d0a446ae7e4eeb6c193c94e0725bce8a572f15ce458ea323c66fdf53c4
diff --git a/kde-plasma/kgamma/kgamma-5.20.0.ebuild b/kde-plasma/kgamma/kgamma-5.20.0.ebuild
new file mode 100644
index 000000000000..632cbd817964
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.20.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KDE_ORG_NAME="${PN}5"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Screen gamma values kcontrol module"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index a097c3b6b6bd..e8597ed95870 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1 +1,2 @@
 DIST khotkeys-5.19.5.tar.xz 1855968 BLAKE2B 464797fce42a50313c187743a7213b870af805aea2f75e0e3564e81fec49c334f9574515b267a1acd57dae1f7e8b6e62849ce6e554db52bd452bcac05374660b SHA512 c7832ea7cb2890cbdf9d160b1658a393e105903e54b87cd10cf00f5bffa1b240e70685a201e2b4d580b4083e903770a2b26fd65f68f05302798320e7f20103be
+DIST khotkeys-5.20.0.tar.xz 1854028 BLAKE2B b2affd8852490a03cb2989d96758143fa06bf79859526aa84a3133c8b740057e6734ea7c18399c6784253f7ec49139683aff527868a504eb78789763c0505c7e SHA512 4d1315cec456af364023416e4ff526e143790a75cdb5fbdbd14a63fe13fee12f2cc7d0cccd7a2a4b4d21597b7511ead18a174614e71c41d658b1bb6fbc07393b
diff --git a/kde-plasma/khotkeys/khotkeys-5.20.0.ebuild b/kde-plasma/khotkeys/khotkeys-5.20.0.ebuild
new file mode 100644
index 000000000000..53a2ae627eb4
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.20.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace hotkey module"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index b45aafc9056c..7f43fc48a9ad 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,2 +1,3 @@
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.19.5.tar.xz 1265760 BLAKE2B 3af323d32e07d310aa224f47c292ae03748aacea0d7cf56770e5a301f9698d1767159f97e0d43733d9a09d6cfe56c41a4a44f988e3000a1dfc06f271accef0f4 SHA512 732d6111f59e099fb032966667b6d7907e607939884714a95f0a2e48903f8a0d7e2331a87611ee058a4bc18bcb012c92040415812243fab4d618a07f2e7dccaa
+DIST kinfocenter-5.20.0.tar.xz 1279124 BLAKE2B 079a78690084449ee5871ce2160d35a4f7a6bda39b942989ada002a817f933255cdc8e51f5b2abfa11b0d8ce048d30ad5dbdfb9d916231513bcb35e4c597fc39 SHA512 8e544db63341cf29e578271b29272d2407c014ddf181ba61f83c6200643e66433e06c067620bd18c9a0a5e337d794800c0e5ca762a2ff733c1de76551fdd5b11
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.20.0.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.20.0.ebuild
new file mode 100644
index 000000000000..444067eef583
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.20.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Utility providing information about the computer hardware"
+HOMEPAGE="https://userbase.kde.org/KInfoCenter"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
+
+BDEPEND=">=dev-util/cmake-3.14.3"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	x11-libs/libX11
+	gles2-only? ( media-libs/mesa[gles2] )
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		media-libs/mesa[X(+)]
+		!gles2-only? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? (
+		>=kde-frameworks/kwayland-${KFMIN}:5
+		media-libs/mesa[egl]
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/systemsettings-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ieee1394 RAW1394)
+		$(cmake_use_find_package pci PCIUTILS)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+	)
+
+	if has_version "dev-qt/qtgui[gles2-only]"; then
+		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
+	else
+		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
+	fi
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# TODO: Make this fully obsolete by /etc/os-release
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "NFS information module" net-fs/nfs-utils
+		optfeature "Samba status information module" net-fs/samba
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 839bd26db411..406873779c1d 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1 +1,2 @@
 DIST kmenuedit-5.19.5.tar.xz 896836 BLAKE2B 35e921a58856a3ed63f5ef912b06d3db1670e6e7e278d2120aaad69964a2fa60f536634d3b0dc3781a6b487df5aa948eec4ff943a7413f88dc1f9f40010a36d3 SHA512 332fa310a8a4d0c792e05db5427d16b3290998f0da5c7184d674d8104e8079bff51065575a98f61b83899df6cdd7f4be6daf0a5dc014f30bf1ced49c896e1241
+DIST kmenuedit-5.20.0.tar.xz 893652 BLAKE2B ece7c0eae7e977f05f1bec31a0cc6279ee5576d3198cb93999132d8a8c7c09b456a760e23d2bca05927b004c0f35724a06bda5c0a30589ef670d7a518d1c20a8 SHA512 9948194bcc75b3b8ef21292ab47ead450476a468dc7777b0613a8bf65bd946ed38bd6264329d27e28879f1c02cee78e739e02463d0b6950696135d1f5dae0ab0
diff --git a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.20.0.ebuild
similarity index 50%
rename from kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
rename to kde-plasma/kmenuedit/kmenuedit-5.20.0.ebuild
index 678e2ab4e74a..838c509e0282 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.20.0.ebuild
@@ -4,38 +4,38 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
-https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
 "
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kinit-${KFMIN}:5
 "
-
-PATCHES=( "${FILESDIR}/${P}-hidpi.patch" )
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 6e211005d1b1..4f491ea175d6 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1 +1,2 @@
 DIST kscreen-5.19.5.tar.xz 113748 BLAKE2B 91dda071d5b70706f8a5735905c22333eb68c8bab32fe138e77e12764bbfc8d19481b285548caefafea91f666b2c98e5b058f15f481862903fb1cc109be96d3a SHA512 ce47e5b0e16f985811d0e71d4c97d2d25d2a4258732c5b7b8706cdfd176c4883c431ea946833abcbc87fdd81ed6d546da6e23640b4586b8013591ee5917c20f0
+DIST kscreen-5.20.0.tar.xz 113696 BLAKE2B 00bc319e9ff143efd65a9f6853a53fe460c6da6eef7c2c70ee828ae54bc189f1880753ae5a0722d6f24e4ee75eec20b08f1ef9be5b9edf4717dfa60e430d243d SHA512 c8b8f87263f92cbf572497a717e20d4d85edc1ae9ac2dc01142dfd93bc048e09176485a0687baa7047af5dd23638afdcd05a0d3bf15a34a02d9c447fa0af473a
diff --git a/kde-plasma/kscreen/kscreen-5.20.0.ebuild b/kde-plasma/kscreen/kscreen-5.20.0.ebuild
new file mode 100644
index 000000000000..881d42d461c6
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.20.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://invent.kde.org/plasma/kscreen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsensors-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 0a1c70b85a02..ad684d8a8be1 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1 +1,2 @@
 DIST kscreenlocker-5.19.5.tar.xz 126420 BLAKE2B bef083f6ffaa7930446a234c35d628ffe81c187718be48ee3158b50d5eaf7b5989abda1d3f23a275cff5b949d101cc43e4819bc44b300674681b4233bcbf1f1b SHA512 aa112b28374e2ccfa257d161d47de96ba8a884dbf6cdc59be9dac3624e49472aad7ee0f413e63c9a001969b7e0413d2571e19f39e232e46cefe112fb7f880eda
+DIST kscreenlocker-5.20.0.tar.xz 114332 BLAKE2B 2c4b36825597c3666f64846d8b8e885c2445d04d70f05a7bfc80d05b50f04108c313eb1efac0c3455d3c0b1a5acb24a0ad16358180433ff6a4df8589a63928fc SHA512 229c81a41995205ba6b06c09d75f75d6eecdd5e0c8fbc428b0b411b1abafe14b9dc8e0e1afc5468e6c851d899fefca98b6d5bc8b0464a5e8f73ff291a14b1beb
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.20.0.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.20.0.ebuild
new file mode 100644
index 000000000000..055daeafa7c7
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.20.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+pam"
+
+COMMON_DEPEND="
+	dev-libs/wayland
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	pam? ( sys-libs/pam )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake_use_find_package pam PAM)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	ecm_src_test
+}
+
+src_install() {
+	ecm_src_install
+
+	if use pam; then
+		newpamd "${FILESDIR}/kde.pam" kde
+		newpamd "${FILESDIR}/kde-np.pam" kde-np
+	else
+		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 5a3f384dac74..b5fd09f0dd1d 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1 +1,2 @@
 DIST ksshaskpass-5.19.5.tar.xz 23572 BLAKE2B c399be04e33a51968c7c3d962039f7aaff176c7a14bb5d8d2da36e999908aba1f3fa07337412390470cab1342a70bd37b2241b750e7bf852980c77810f311873 SHA512 7bd70985cb4a133e49d58b27c9266222913097154b78f60fc55b7ea3e684723b3ae55cdd0b44f58dd7c2cb54cc2f6046907b7881355b437689d9e470c2aafdd4
+DIST ksshaskpass-5.20.0.tar.xz 23528 BLAKE2B d1583101a4ad0ba1dd547e38ab053870bcd8cfbb11b6e80b648ec334bfd1fc1dd8f36596f8d5c385225c26c357a5c2b033787a440a98e4f509e6f96c2253761f SHA512 a0e7cad3debde539da8432a84324a42f98206a2d5c22201dca89fe35dda15259eb5aa32ae20ded6c33b7db0b6ba4e4f44fa5b3ea703ecd3e7055e23005dcc563
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild
new file mode 100644
index 000000000000..004a7a7eb33f
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.20.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
+HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	ecm_src_install
+
+	insinto /etc/xdg/plasma-workspace/env/
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "In order to have ssh-agent start with Plasma 5,"
+	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and uncomment the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+	elog "to properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
+
+	# Clean up pre-5.17.4 dirs
+	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
+}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 2ae2a00de295..1c348e7717b2 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1 +1,2 @@
 DIST ksysguard-5.19.5.tar.xz 542628 BLAKE2B 3aeacb401c79723aa46e9eb5df32785e314d7a52704d983e5c6b48dd841e908ec84c5b28c609accec990d6011d5355ba3363329973a68149f03b0b20d5d59265 SHA512 5dd3503e3792c247fa2dab274347ae00ac3ddd0090b8b5115abc90c84630e0f7376ce2ec43a853e2a9cfdadb31b142ea70190b54b65c7a45b5839b1dde5a1feb
+DIST ksysguard-5.20.0.tar.xz 558340 BLAKE2B 4fa48e52bc536ecf15f27999ea15b7094f68e9f73af1b8d5815694608775b84fbf58b04f542466f1b077c89b6955b634f4f59db8919cc6793b901a8cef634ca4 SHA512 db3fa91c7b9c578766a4011ad8e60d9c0028189f8505d101e4f0cf8e1bf63e951adcb0feba3825696b33b1fa2c958c0e8ac08575b66c3d1a9258508a87af7178
diff --git a/kde-plasma/ksysguard/ksysguard-5.20.0.ebuild b/kde-plasma/ksysguard/ksysguard-5.20.0.ebuild
new file mode 100644
index 000000000000..273236fd863c
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.20.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="lm-sensors +network networkmanager"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	lm-sensors? ( sys-apps/lm-sensors:= )
+	network? (
+		dev-libs/libnl:3
+		net-libs/libpcap
+		sys-libs/libcap
+	)
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package lm-sensors Sensors)
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+		$(cmake_use_find_package network libpcap)
+		$(cmake_use_find_package network NL)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/ksysguard/metadata.xml b/kde-plasma/ksysguard/metadata.xml
index 61d3b2c41702..53a4d2a60e76 100644
--- a/kde-plasma/ksysguard/metadata.xml
+++ b/kde-plasma/ksysguard/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="pcap">Enable per-process network statistic collection using <pkg>net-libs/libpcap</pkg></flag>
+		<flag name="network">Enable per-process network statistic collection using <pkg>dev-libs/libnl</pkg></flag>
+		<flag name="networkmanager">Enable improved backend for Network statistics using <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index e615c373baa5..46e5899b5335 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1 +1,2 @@
 DIST kwallet-pam-5.19.5.tar.xz 19932 BLAKE2B 28d8419f500c163ba15a79cc994af70b723dff24fa8c32e899bd856766290f20d09e3ee98e164d55596d1b97137e92096f9c2c3cf2386bb700aa0b7bcfed1c39 SHA512 3fe30f979f6ee838b073b7afdb406068f90529fbbac3513d65145f6a46ab8ba0b61ba11a3e9192c60b1ddd50e9af448c1298725fc01dca483b40a8030053095d
+DIST kwallet-pam-5.20.0.tar.xz 19860 BLAKE2B 03c294114df176089dbf2f24f6b30b7a60c75aae8065b53841115c6ad388040b27cf551303f310f112672c2031fc2d50dd773f67fa02d844419005f9e4a117fd SHA512 99c715222adb5c1d825981d2898528e01ee84887fd12e6cc9dfcab86edd5c3325a71bfb394d7d9e60f4cc1388d1e36410b34f579e2c840a121867787460f7b09
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.20.0.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.20.0.ebuild
new file mode 100644
index 000000000000..121f17823eb9
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.20.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org
+
+DESCRIPTION="PAM module to not enter KWallet password again after login"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	sys-libs/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
+	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
+}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 9c905be2804c..448166aec5c9 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1 +1,2 @@
 DIST kwayland-integration-5.19.5.tar.xz 21276 BLAKE2B 0d2a243b665efa9a1be2464dc04a4d01e71be65cff143fddd60e49c4d4d1377ae4982087711b1c5706a1c95434aa8e751e2ea35c2e50e3a0de8ff3a36abbab5b SHA512 db5f05ac9d942650b0933d723ba7138d35d262757b229f5f79b07a621543fdd87679da28d9fa059dc48064db39b69ce34f5296decdfc126442ac3f9f4bbbb2b6
+DIST kwayland-integration-5.20.0.tar.xz 21396 BLAKE2B 3ffecdd37717031e999c77b0e85e8446722f71a4439f013b09c1b3c4aefb8dd3ea0c0e5930771f5e474a704e62004a14565dc8cd60fc8f930390920c9c4fa653 SHA512 088e59c0337bd6876802b3f2732d43c9f5120894eb2ecbf9364cd0e8638488d2bb4d9ed5487425ae274e10f14a2445b76dda2c229d5bf7f83ec9f7ab67ad334f
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.20.0.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.20.0.ebuild
new file mode 100644
index 000000000000..7f14920c0b09
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.20.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index b701523f910b..621064f5cf40 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1 +1,2 @@
 DIST kwayland-server-5.19.5.tar.xz 229752 BLAKE2B 8730fc1e14512756478870a1446310db7a0130afffc29ad42d4a2efa18bdd0991c89c508072c4741ff6a67a28f8cb534b4f097762444ac42b3d2189d753dfa65 SHA512 5e039e38f290daed747a4c5d0fb37c828ad7ff1e05b735abb30bfaa69d67e812ea89b78921ec0877622ed9127a92aa76b5c6468126004c0f53ddf909a45f391b
+DIST kwayland-server-5.20.0.tar.xz 220692 BLAKE2B c1ecd9390b7469fdbd8090f06b95c8952deca5f6822a0f7155beaaad752f7b6479b9ee8f8e1ec2b087b19082f0efc97b06b144adb0a9e4849c86375be6547469 SHA512 c5dab0a86e4a355294c9b2b793f4d0aa091d260abd85b7fe9523941792493c6cbce640e00957247996456acc8baca7ff4d42af84f5b30089844c8eb752fea4ba
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.20.0.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.20.0.ebuild
new file mode 100644
index 000000000000..9ac4272b9ae9
--- /dev/null
+++ b/kde-plasma/kwayland-server/kwayland-server-5.20.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Wayland Server Components built on KDE Frameworks"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/wayland-1.18.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[egl]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	media-libs/mesa[egl]
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-libs/wayland-protocols-1.15
+"
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT+=" test"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 9d92c9f94aa6..9313cdf43e84 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1 +1,2 @@
 DIST kwin-5.19.5.tar.xz 6260188 BLAKE2B bcf3c8afc00af0df8cddeb49396bd23df6178e379ac4c3ba3c547a2c602d309202a72136b69b83f729434fc5691ba24699cf3f44d47b2c033623bca5d551bdb1 SHA512 97ad0096066d99b4bba3089416a6d3744b6f83d82a004caa8762b420cad34cac4221b3535678d4c6f1bcb43c4d97db56be5ac68c4ac501dc168f4472a6c0dad5
+DIST kwin-5.20.0.tar.xz 6310596 BLAKE2B 111d6a4da802675f0fbca57176375a84e104d97064769a034aabe51b9b3855954d32c594ad1c7b996f8ee74891d32e386fcf82a1d31f5d8e9d515ee22f403c82 SHA512 1565f2226b00706b02a20b3d49c9d14ee351bb47c183a3a0bd69d9662db802bd5b340eaa9817f5f01c07b3b0c60a10df32698b4605f8e0242c5fd5436307753a
diff --git a/kde-plasma/kwin/kwin-5.20.0.ebuild b/kde-plasma/kwin/kwin-5.20.0.ebuild
new file mode 100644
index 000000000000..da2325921b7c
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.20.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="accessibility caps gles2-only multimedia screencast"
+
+COMMON_DEPEND="
+	>=dev-libs/libinput-1.14
+	>=dev-libs/wayland-1.2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsensors-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwayland-server-${PVCUT}:5
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libepoxy
+	media-libs/mesa[egl,gbm,wayland,X(+)]
+	virtual/libudev:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libdrm
+	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxkbcommon-0.7.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	accessibility? ( media-libs/libqaccessibilityclient:5 )
+	caps? ( sys-libs/libcap )
+	gles2-only? ( media-libs/mesa[gles2] )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
+			-i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package accessibility QAccessibilityClient)
+		$(cmake_use_find_package caps Libcap)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 9b1b37b6a988..24eb99364154 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="multimedia">Enable effect video button in desktop effects KCM</flag>
+		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index c616eeda1f68..ff5c10adb8fa 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1 +1,2 @@
 DIST kwrited-5.19.5.tar.xz 20208 BLAKE2B 76a5ddb2c9e4e3e47f1deb65c077634715dd1853a879573ce6be259d5cfcfb9ce7bd68b5967fa006e84f34dafdaf82ee18c9154ab28bcf49d152edc6816e7b10 SHA512 c5beb32da7ea08d944d603db9f5af6356b7742be9408f8d5e540d2e782c54d0642f93a784420a931ce807f980fc6aed0135d54e8cb03f88831ac7c0404dc7136
+DIST kwrited-5.20.0.tar.xz 20164 BLAKE2B f57ca3cd8fd9432be6c0517c39e6fc45d14aed46c5fd3046626e632d39f6603f995b8934b9408422a8ca448e4fbcb04e78f427e09c6f20d0776dee82535aea24 SHA512 3bc33d0e1747042e3d2ab6c438b0fdf01e50073798b217f106e6d00d2b534322572f8263ef6b687c8f3d819b143431b59eaa473b17073dfb19d46e483d9174fb
diff --git a/kde-plasma/kwrited/kwrited-5.20.0.ebuild b/kde-plasma/kwrited/kwrited-5.20.0.ebuild
new file mode 100644
index 000000000000..adb7f26f7156
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.20.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 160b0f807e78..8e29797cb7f2 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1 +1,2 @@
 DIST libkscreen-5.19.5.tar.xz 85468 BLAKE2B be5d055092395e53e252e879d4bfb5177e45e1b5df96cd53bff81a0cf88b10f84dd1a0b7445bc1073357c98040afc62334aa433e20d5afe3f21f73b3e3ea5cae SHA512 5bc462ee9e322bbdbd375003b962b868a6c6dfff6344e61d39e04644fbb7f409a337116df1c274a664f633b176dfd69af992d3e0e290fa85dbe529cbe1a1e87f
+DIST libkscreen-5.20.0.tar.xz 85460 BLAKE2B 9a0cf3961ef477eb86b2faef03eb39c7ff4e593094e5906bb8073c87c23bbbbed472a83c326dd26e311dc35c4ec3975a6d71fa4cef969593184735e8cc13fb19 SHA512 d516cff6572abe02406451e71efc19749c42eb719f8506df492a462af1a3436ac16f4546ae974328572e0c169cc2a74e7bf055c5ab3c0de13729f9f254506ec1
diff --git a/kde-plasma/libkscreen/libkscreen-5.20.0.ebuild b/kde-plasma/libkscreen/libkscreen-5.20.0.ebuild
new file mode 100644
index 000000000000..443dbf38e962
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.20.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma screen management library"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5/7"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}"
+
+# requires running session
+RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 6a1dbb7f626f..fc4086012632 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1 +1,2 @@
 DIST libksysguard-5.19.5.tar.xz 674900 BLAKE2B 88408494360921bff732ba535a932b2a17d8faba9a0cd231754dda6116ce52d8cb6ed32f89f05e16091b54a378d3d50e5e46feff1e27b46260f3803ca78b9855 SHA512 8e723eff1e50195005a91dd558df0ddce956c33478c00e177f1eae4d9997ea8332d86bb8fae1eb2d18bfe3bdceefa31fe4211dfcf4bb1c463d347ced33e75348
+DIST libksysguard-5.20.0.tar.xz 682884 BLAKE2B b040de84412903918f7a6ed1881b7d4df9210011a01dcf6bdfff52f09fe58b69f83c295ebde813c032f5be83dbfd68209745cecadd10fceec6a1a0e9fdd11de8 SHA512 8265461921a978c7ea202a577a3ad430b9ea6ea0479665ef11741ae89583c2bb7f58cb1aa82794b1badb4b3356f0305fa8d6efdbaddc6563bfceec099501dd28
diff --git a/kde-plasma/libksysguard/libksysguard-5.20.0.ebuild b/kde-plasma/libksysguard/libksysguard-5.20.0.ebuild
new file mode 100644
index 000000000000..3509adbb00c8
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.20.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+SLOT="5/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="webengine X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	sys-libs/zlib
+	webengine? (
+		>=dev-qt/qtwebchannel-${QTMIN}:5
+		>=dev-qt/qtwebengine-${QTMIN}:5
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+DEPEND="${RDEPEND}
+	!<kde-plasma/plasma-workspace-5.18.80:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package webengine Qt5WebChannel)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 695514
+}
diff --git a/kde-plasma/libksysguard/metadata.xml b/kde-plasma/libksysguard/metadata.xml
index fffdaaa4785a..b9f39f2d0ec8 100644
--- a/kde-plasma/libksysguard/metadata.xml
+++ b/kde-plasma/libksysguard/metadata.xml
@@ -9,6 +9,7 @@
 		<subslots>Reflects ABI compatibility by soname version</subslots>
 	</slots>
 	<use>
+		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="webengine">Enable display of detailed memory information using <pkg>dev-qt/qtwebengine</pkg>.</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 764bc8aa0d6b..4991332bbe53 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1 +1,2 @@
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
+DIST plasma-workspace-5.20.0.tar.xz 8991780 BLAKE2B 40e57968595b53c63f91bf58fd7714586a9cc1caf2e5cbddc94463699383997e4067b1250fd62a6b2acd6aea6ac0b0e7539920b85aa6f2b95017e5495a68e4c2 SHA512 3b49ad852a1c2cfb1b4f304a25423506825b94ca80809e0e9ea55e1efa100b0b5411b3591087c35750f971e78dc640d851a367fae7c33902d02610d21511a613
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch
new file mode 100644
index 000000000000..8c8213d002dc
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch
@@ -0,0 +1,108 @@
+From 30d75ef4b3e75155e78924aa82aa9f368bb86f4f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 2 Feb 2020 18:29:57 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++-
+ 1 file changed, 66 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ba097a6e..66f70c0b6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,56 @@
++project(libkworkspace)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++    set(PROJECT_VERSION "GENTOO_PV")
++    set(PROJECT_VERSION_MAJOR 5)
++
++    cmake_minimum_required(VERSION 3.0)
++
++    set(QT_MIN_VERSION "5.14.0")
++    set(KF5_MIN_VERSION "5.71.0")
++    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
++    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
++    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++    include(KDEInstallDirs)
++    include(KDECMakeSettings)
++    include(KDECompilerSettings NO_POLICY_SCOPE)
++    include(ECMMarkNonGuiExecutable)
++    include(CMakePackageConfigHelpers)
++    include(WriteBasicConfigVersionFile)
++    include(CheckIncludeFiles)
++    include(FeatureSummary)
++    include(ECMQtDeclareLoggingCategory)
++    include(KDEPackageAppTemplates)
++    include(ECMMarkAsTest)
++    include(GenerateExportHeader)
++
++    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Init Plasma WindowSystem)
++
++    find_package(KWinDBusInterface CONFIG REQUIRED)
++    find_package(KScreenLocker 5.13.80 REQUIRED)
++    find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
++
++    find_package(X11)
++    set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++                URL "http://www.x.org"
++                TYPE OPTIONAL
++                PURPOSE "Required for X11 support")
++
++    if(X11_FOUND)
++        find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
++        set(HAVE_X11 1)
++    endif()
++
++    if(BUILD_TESTING)
++        find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++    endif()
++
++    check_include_files(unistd.h HAVE_UNISTD_H)
++
++    configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
++    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++endif()
+ 
+ set(kworkspace_LIB_SRCS kdisplaymanager.cpp
+                         kworkspace.cpp
+@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
++else()
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
++endif()
+ 
+ set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
+                             "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
+@@ -34,7 +95,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface)
+ 
+-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
+ 
+ add_library(kworkspace ${kworkspace_LIB_SRCS})
+@@ -100,3 +160,8 @@ if(BUILD_TESTING)
+     add_subdirectory(autotests)
+     add_subdirectory(tests)
+ endif()
++
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++    install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
++    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
+-- 
+2.27.0
+
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.20.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.20.0.ebuild
new file mode 100644
index 000000000000..fa283d1fa3ce
--- /dev/null
+++ b/kde-plasma/libkworkspace/libkworkspace-5.20.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Workspace library to interact with the Plasma session manager"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-plasma/kwin-${PVCUT}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/plasma-workspace-5.14.2:5
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" )
+
+src_prepare() {
+	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
+		rm -rf po/*/docs || die
+		cp -a ../po ./ || die
+	fi
+	ecm_src_prepare
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			ki18n_install(po)
+		_EOF_
+	fi
+
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
+		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 78bc780b161a..607e10c8cc81 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1 +1,2 @@
 DIST milou-5.19.5.tar.xz 64612 BLAKE2B 588e5b98d5a1aa061dfe09d9566c68904c882a7a4120e3fadaed60fa1f372013d966511693ee44bb67d6b554e44d287374784ed02b25c04a0b7b06fd34240fa1 SHA512 c480d22ec7f6be8031af13b23914add05d331b017c1d4d2a193a47f31cad1ede0bfa833a9368d0ba9c35cf5b0f97e23d15307ae45569d8bd9d7fde305d17b913
+DIST milou-5.20.0.tar.xz 54912 BLAKE2B c00d8b23f109e23c6cc5066a49124b930e31f0c65815ea38c333b2b915dee7be3b665e60bedd1c223b1f3363c166dc74d1b60c7354fc083770b91c651d2f88f5 SHA512 b66e2f0437930b12e88bdd39df67c969b0a07fb54880cd76dd738e8b79b9aa993bbf3d80d04cce6bc9ef51e0b09853919bb38cff5dc606da74b99709cffb45eb
diff --git a/kde-plasma/milou/milou-5.20.0.ebuild b/kde-plasma/milou/milou-5.20.0.ebuild
new file mode 100644
index 000000000000..f320720f61d8
--- /dev/null
+++ b/kde-plasma/milou/milou-5.20.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://invent.kde.org/plasma/milou"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.19.80-disable-manual-tests.patch" ) # bug 732584
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 50830ef37d4e..d5a05a979717 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1 +1,2 @@
 DIST oxygen-5.19.5.tar.xz 4462408 BLAKE2B 94a284ed12f6f1d2b04518c9dd6e891ee78c3959c39a82a339e58dddfde442e9bf2ad0a1296dea2f511a3e099fe61deea570f0f0a9b01ccff50e3ff8cd2d45be SHA512 53eec62c875dfb94d6b757e2b37b0ac23756d16ad4841cc6d7d9992cd2feaf8d7fba35987cd75f265563783dac013df509f7261033d169b8dca5e545e0eb03f4
+DIST oxygen-5.20.0.tar.xz 4459544 BLAKE2B 9f64d4f2522bef81a35bc96f02797d8f00fe8ca4519d6e4dadaa8c9594c4bda4840c3da7c59eee798e5b053b68b45814da626b3222e0393b9494fe35ec614280 SHA512 9a90a5e18932375955c1db1cfb29ec7a00bae3c7afbea27b47d13f53c614d760022d52bbc4114b5858b9d090be90c2cbe585e3026a53583039fc479ae0b0d185
diff --git a/kde-plasma/oxygen/oxygen-5.20.0.ebuild b/kde-plasma/oxygen/oxygen-5.20.0.ebuild
new file mode 100644
index 000000000000..633b06070b40
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.20.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/oxygen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="wayland"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/frameworkintegration-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	x11-libs/libxcb
+	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kservice-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/plasma-desktop-5.16.80
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package wayland KF5Wayland)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index d460a9af47b0..12fcae7b2147 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1 +1,2 @@
 DIST plasma-browser-integration-5.19.5.tar.xz 176780 BLAKE2B f46d8434a957d52ecf3b475c08b106705df2c4486b85b7365b7ddf7144d2cae993787c53397ed0e91c0cd3210f9f746a22d61df08a5bd4d1d5eb58605572b452 SHA512 c7334c4ab4ab3e0e1e93715257995fa7b16103a61eb40877b3e859f75b781e27456f96d5fef409284d0f584335f723b30a5a0bee0a06ffb9cea9012cb158b9e1
+DIST plasma-browser-integration-5.20.0.tar.xz 191056 BLAKE2B 99e1d197c0b16d02908ce555ffb41e07356f2319671de8521e80a9896c9a052c09b8e81d37bfc3300a3484e933965db42eff94efe75abdab8d2960a8966b1410 SHA512 59184545c26f8592048b0473ac4852612fe59098bce8bf67d624e904c1d9d451a47ac7f27cfdabeec75bf0f9b7ac49be712acecd7286810cc7612f09bb20e2e3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.0.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.0.ebuild
new file mode 100644
index 000000000000..07e07c66f12c
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
+
+LICENSE="GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/purpose-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 4bda8e26d844..a42f474976d7 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-desktop-5.19.5.tar.xz 9430088 BLAKE2B 02894dfdc8c0d4535782629059b7d69e7722c63ef47c44077d5b49ac489b53af8440ba361a31a327783fe7a2b56d1812d59c8f6f0797c8fcc81aa90c1fac96c4 SHA512 d7c7b26dc5a7d4804a780833f8d22797312b845962ed4f9218c448fcb3c720c032eca1e79bec5f9c084f1825f0b6f26c34ffe032320396c9092e04a5b05c3d12
+DIST plasma-desktop-5.20.0.tar.xz 15860268 BLAKE2B 7c9e3d43251c5229fd46b618920dcbd449ba187637fe827e40a18a47481b12fc01617d8879fff18879fed497d143fbf0ed1129aac2b11949c34369988174339c SHA512 d34560977b75854a80cd75a9a15c9fed614ea9c36a724c2e5df9ae6e3439762a34d7afe33892beae2e7dff3fc555673f27069c43bb0bf774ad8740e3476be651
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index 49d2b2bec6af..7704dc621a49 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
+		<flag name="kaccounts">Build the OpenDesktop integration plugin</flag>
 		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.20.0.ebuild
new file mode 100644
index 000000000000..8dcf902a9647
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.20.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-0"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="emoji ibus +kaccounts scim +semantic-desktop"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	>=media-libs/phonon-4.11.0
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbfile
+	emoji? (
+		app-i18n/ibus[emoji]
+		dev-libs/glib:2
+		media-fonts/noto-emoji
+	)
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	kaccounts? (
+		kde-apps/kaccounts-integration:5
+		net-libs/accounts-qt
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/kdeplasma-addons-5.15.80
+	!kde-plasma/user-manager
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/oxygen-${PVCUT}:5
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	kaccounts? ( net-libs/signon-oauth2 )
+"
+
+PATCHES=(
+	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use ibus; then
+		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		$(cmake_use_find_package kaccounts AccountsQt5)
+		$(cmake_use_find_package kaccounts KAccounts)
+		$(cmake_use_find_package scim SCIM)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+	)
+	if ! use emoji && ! use ibus; then
+		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
+	fi
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# test_kio_fonts needs D-Bus, bug #634166
+	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
new file mode 100644
index 000000000000..67993784ebfe
--- /dev/null
+++ b/kde-plasma/plasma-disks/Manifest
@@ -0,0 +1 @@
+DIST plasma-disks-5.20.0.tar.xz 60536 BLAKE2B f0189cffcbf368144cfd6999cd56158909d39a754a60b1ef756b9f52ebd2818307a9607cca559e95f1a3935c5529089d73d52510beae944e3430f40bbdb2d40d SHA512 f5037f0cbf66b69cca052ab9386a1564d204b736f9b62627465ea3e90617c4675a9c7e6e42adddd1104e9a929f90857f16bda1278bb3b025a31a88907423c37a
diff --git a/kde-plasma/plasma-disks/metadata.xml b/kde-plasma/plasma-disks/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-plasma/plasma-disks/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.20.0.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.20.0.ebuild
new file mode 100644
index 000000000000..d6925fe9ea03
--- /dev/null
+++ b/kde-plasma/plasma-disks/plasma-disks-5.20.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="true"
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="5"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	sys-apps/smartmontools
+"
+RDEPEND="${DEPEND}
+	kde-plasma/kinfocenter:5
+"
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index bb7c76640003..8503270bfec9 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1 +1,2 @@
 DIST plasma-integration-5.19.5.tar.xz 57464 BLAKE2B ef5ec9f849087ae738a1ff1de14a77994b4486f89b632777caa8e0aad67cad8553bdf1d0553893361ab4c11ddba0caf32464cb49f08047cf2d40375f789c166e SHA512 9e17e1720e5d5c1d3cada3f1eb891d27fd189eb65378c2e0be6547c79d93d5df2f785a3c67d35a4a374d320b118ad3b7d3fb7d968a7f5b629e505d21c83cfe36
+DIST plasma-integration-5.20.0.tar.xz 59856 BLAKE2B 6e28dfeed9abe7362522fc7d429caeb6011cd89d19c2d50d79b7dd39f2d3f169fb85e90ed556928e96933458d3ecd00a7ded60f47d762fa7f6b41a1323048114 SHA512 fd6d00e14bff37e14b407c9e6d6f5c1b4fe7a98218f714e8b79924862b8c1d0a83b367509a5924587f29f6ea5d1d8dc32643621e17ba01a0b682d2775653bbc3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.20.0.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.20.0.ebuild
new file mode 100644
index 000000000000..06aad18a2813
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.20.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.20.0.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.20.0.ebuild
new file mode 100644
index 000000000000..e2c906f6603b
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.20.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+HOMEPAGE="https://kde.org/plasma-desktop"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth +browser-integration crypt +desktop-portal discover +display-manager
++elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager
+plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+RDEPEND="
+	>=kde-plasma/breeze-${PV}:${SLOT}
+	>=kde-plasma/drkonqi-${PV}:${SLOT}
+	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
+	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+	>=kde-plasma/kdecoration-${PV}:${SLOT}
+	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+	>=kde-plasma/kgamma-${PV}:${SLOT}
+	>=kde-plasma/khotkeys-${PV}:${SLOT}
+	>=kde-plasma/kinfocenter-${PV}:${SLOT}
+	>=kde-plasma/kmenuedit-${PV}:${SLOT}
+	>=kde-plasma/kscreen-${PV}:${SLOT}
+	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
+	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
+	>=kde-plasma/ksysguard-${PV}:${SLOT}
+	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
+	>=kde-plasma/kwayland-server-${PV}:${SLOT}
+	>=kde-plasma/kwin-${PV}:${SLOT}
+	>=kde-plasma/kwrited-${PV}:${SLOT}
+	>=kde-plasma/libkscreen-${PV}:${SLOT}
+	>=kde-plasma/libksysguard-${PV}:${SLOT}
+	>=kde-plasma/milou-${PV}:${SLOT}
+	>=kde-plasma/oxygen-${PV}:${SLOT}
+	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
+	>=kde-plasma/plasma-integration-${PV}:${SLOT}
+	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
+	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
+	>=kde-plasma/powerdevil-${PV}:${SLOT}
+	>=kde-plasma/systemsettings-${PV}:${SLOT}
+	sys-apps/dbus[elogind?,systemd?]
+	sys-auth/polkit[elogind?,systemd?]
+	sys-fs/udisks:2[elogind?,systemd?]
+	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
+	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
+	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
+	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
+	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
+	display-manager? (
+		sddm? (
+			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
+			x11-misc/sddm[elogind?,systemd?]
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
+	gtk? (
+		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
+		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+		x11-misc/appmenu-gtk-module
+	)
+	handbook? ( kde-apps/khelpcenter:5 )
+	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
+	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
+	networkmanager? (
+		>=kde-plasma/plasma-nm-${PV}:${SLOT}
+		net-misc/networkmanager[elogind?,systemd?]
+		qrcode? ( kde-frameworks/prison[qml] )
+	)
+	plymouth? (
+		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
+		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
+	)
+	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
+	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
+	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
+	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
+"
+
+pkg_postinst() {
+	has_version sys-auth/consolekit || return
+	ewarn "An existing installation of sys-auth/consolekit was detected even though"
+	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
+	ewarn "There can only be one session manager at runtime, otherwise random issues"
+	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
+	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
+	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+}
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index a5e1726fed4c..5a87ef97a260 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1 +1,2 @@
 DIST plasma-nm-5.19.5.tar.xz 855504 BLAKE2B a2437794d9de5a0fda6328dd0e352fad956710cef06f9bc2d6590dbde7f2eb469d051db6fc4ce647fe59bf95e48e6e6c9ff68e512a2992abe183ab309112f94d SHA512 2fdd42e7c9bba0b069e0ca39f8ef996b36a807a4065172a816023c32d5d24869bf92c577c9cc5a08bb9e8b13c628b7cbd8346d17dc1e6814c931f7f7ec9439a7
+DIST plasma-nm-5.20.0.tar.xz 842416 BLAKE2B 51e553fd14662327339a909edbc9f6339bf2e6b8eb7a5da619f7580ce154e7ffdc49d9eddbd5d9e537d92f4bc72b24b813b1ace74b1ea058e8238ef8db5b67c9 SHA512 db78e2c65a09cf6d77032c1a63ba0d66bac3946944a25f08f7267bfb776a39736189668ab3e2eaa815f09f0d7993bdc1384f9267e035053e40051b23a204d7f5
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.20.0.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.20.0.ebuild
new file mode 100644
index 000000000000..dec9064ff778
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.20.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+	>=app-crypt/qca-2.3.0:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	net-misc/networkmanager[teamd=]
+	modemmanager? (
+		>=dev-qt/qtxml-${QTMIN}:5
+		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
+		net-misc/mobile-broadband-provider-info
+	)
+	openconnect? (
+		>=dev-qt/qtxml-${QTMIN}:5
+		net-vpn/networkmanager-openconnect
+		net-vpn/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
+		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake_use_find_package openconnect OpenConnect)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if ! has_version "kde-plasma/plasma-workspace:5"; then
+		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
+		elog "However, the networkmanagement KCM can be called from either systemsettings"
+		elog "or manually: $ kcmshell5 kcm_networkmanagement"
+	fi
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 6847a416e2c8..8aa394c76402 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1 +1,2 @@
 DIST plasma-pa-5.19.5.tar.xz 108156 BLAKE2B cbbb50c102d77b4eddb865daddb432e4ec1e7b27d033ecbd87c0bb8d64b565eebc206d4c13b197ea4f5bff4693e4ef9c9e3570e21fc177adc58f478683269603 SHA512 90d9faf8ab2f4fc7ecdc3e4fa84276ef6c7fc3abc2b2b7a0407e9f001c10330aa98a89ee68602c5378e4e46eec89a88c55e1e01dc2d755e613e4f584234331b6
+DIST plasma-pa-5.20.0.tar.xz 111988 BLAKE2B 62c6f12e3d435d0142e05c5cb1bdc3c484d752b12fcafd31047f3d571203697f20cfb9d777f69ca530cc15ead01707a67ec1161a16c7a17c25191c3ad3f787ca SHA512 2440a8d0891d1c2dd3ac0b914f4de9b89a97d87b1ece8f2eaaeb2e28eaa9e0c6015392eed89f290ebc6fcc35805ce7c20d3b87c07dd1c99a186d3c7c1b476160
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.20.0.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.20.0.ebuild
new file mode 100644
index 000000000000..6d2c03b5f67c
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.20.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	media-libs/libcanberra
+	media-sound/pulseaudio
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	x11-themes/sound-theme-freedesktop
+"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 2ba8a4f3f96a..b72051b72fce 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1 +1,2 @@
 DIST plasma-sdk-5.19.5.tar.xz 263576 BLAKE2B 4752ba4423930bac21893140f397595dc1b5fe9238b054043a7b961756d762a11bd50d806c779e59dd512c2ca304c38bb72ebc1d811d89bb46746cc7f0528dc4 SHA512 66ca604bd27a7c48f8127f04e43c0093c098820e099c944cf7e4715ee0703175761ce6e4be270ffd78b0b1a87fbb2a8e7f670010df0032c4148bcf4275fc32f6
+DIST plasma-sdk-5.20.0.tar.xz 264100 BLAKE2B 3b0ed6fbeb138a575404a43be5ad7d14ef6ef1e9a7c74bdc987bb545cfd8f13ab86bce512bf07a5c9d0f955a50e2804e0c435e31a17e37a45f5bb71efaa2ba57 SHA512 220f205930e9064ae74c3856db9f5075beaa9a8e24bd6bae485cdbca73f115ea21856e55522d5e1c729e981bf3242486b72a90299e79f859a7db746f774ae945
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.20.0.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.20.0.ebuild
new file mode 100644
index 000000000000..aa5ac8634f13
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.20.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="optional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Useful applications for Plasma development"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 732ce76d34f6..8a370221e4cc 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1 +1,2 @@
 DIST plasma-thunderbolt-5.19.5.tar.xz 51300 BLAKE2B c0a9b3665d58ac57c4e4fc71670edaf402d69e8477e0b74875df2d4d666ea8f1c1ce2d0b950f5f20950a431837d651a545f8df19412b60332e0b5d3b08beaa5b SHA512 34c0cb7495b03eaf4f84426fbb6ab2a8b3b336fa1a7f32014231f302c3f1a0e061462e32ded86dab713aa2b602ba5311da3a45e0352f63f59d6e503c1eb7905e
+DIST plasma-thunderbolt-5.20.0.tar.xz 55664 BLAKE2B a19900c70df94f92924e307b1e0b14e2416febd2c4352a01fd6c20d64fea47ebca665e669e08c648c54a1a968bd24a89b820cc6d43207c344435ff539b17bb4e SHA512 c99ff7a606e90b38ef10ce85c4adc375a4425b0d383db58829f8ccf61eeefa290c1f8a2c0b20b10b72af3bf607b4dea2ca0be98f0c6704fcb8e7247f32bfacab
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.0.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.0.ebuild
new file mode 100644
index 000000000000..cbbcdebcf9b0
--- /dev/null
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
+
+LICENSE="|| ( GPL-2 GPL-3+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	sys-apps/bolt
+"
+
+# tests require DBus
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index e40927a3525f..86c597f85241 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1 +1,2 @@
 DIST plasma-vault-5.19.5.tar.xz 145448 BLAKE2B 3b9dff74ab3c7120d9fe1c40007333d514d6773602941987bed55b977c46f7e2b8a27c125c258030a5da638c30e83186d0097ca553e437c2efc13e390b7471db SHA512 d2c00601dae41b924ffb174a7fca9b508ff6e6ae052dd72fa2d9b6767718b4d40a25a7b7c9131f197d25e113c23d74df36829634ce8d83d4a76355aa66ce5771
+DIST plasma-vault-5.20.0.tar.xz 155000 BLAKE2B e43041e09b67ab355a302d230ec094bb3575eb97461609eff791fbf6c5f3e59c493ac56f3c1f2c04a8c9e6e5fc275123bc3871bbef7dbba8228c3672b59f397a SHA512 b16cdd8c40305d402bb378da12b48d39265150f06c10fc7e7b7415934fc10029fdbb21337b9605900a22780f26cea0592c092d3cd622a56ffae4d91b994f9992
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.20.0.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.20.0.ebuild
new file mode 100644
index 000000000000..5113e1eb53e7
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.20.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet and services for creating encrypted vaults"
+HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
+
+LICENSE="LGPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 6fe4be714f98..257fe0ed04a9 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1 +1,2 @@
 DIST plasma-workspace-wallpapers-5.19.5.tar.xz 41824532 BLAKE2B 08b90cd0869e5935320a00fe7687c6a15a3978bcf3288e8e37f48dcef53baaf84921f573949f8dbeeaac2f5861151a4625520fd6a89de264e150918955d39da9 SHA512 79723d50f47412d4904effddbb641d75675a66f517e70164bf55f89e31cbb8246ea1617f90e4cd8e1c5ec169332187586443ead7bc2721b0df85a693ada9287f
+DIST plasma-workspace-wallpapers-5.20.0.tar.xz 45931236 BLAKE2B 137387830561ec272e8b18a403c3fd94dcf4ac7eeaad74ba8e3f9635ce06812bc2fd7ca67b0e3e34c00e1769e718bfc744c22efebfce48bb00858835d1a432a6 SHA512 1e7f3d85f09572ccc613f8c6c6364a32b0c28a5a3843660daf6e96897a5867cec556dd9981c3607b7ea3e635716ad63b1b53400c6a09b777b30624d9e2a12ada
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.0.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.0.ebuild
new file mode 100644
index 000000000000..0fe9c7985bde
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+inherit cmake kde.org
+
+DESCRIPTION="Wallpapers for the Plasma workspace"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-qt/qtcore:5
+	kde-frameworks/extra-cmake-modules:5
+"
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 764bc8aa0d6b..4991332bbe53 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1 +1,2 @@
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
+DIST plasma-workspace-5.20.0.tar.xz 8991780 BLAKE2B 40e57968595b53c63f91bf58fd7714586a9cc1caf2e5cbddc94463699383997e4067b1250fd62a6b2acd6aea6ac0b0e7539920b85aa6f2b95017e5495a68e4c2 SHA512 3b49ad852a1c2cfb1b4f304a25423506825b94ca80809e0e9ea55e1efa100b0b5411b3591087c35750f971e78dc640d851a367fae7c33902d02610d21511a613
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index 81b172506439..b52b6b485856 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="geolocation">Enables dataengine providing location information</flag>
 		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
 		<flag name="qrcode">Enable support for creating QR codes from clipboard data using <pkg>kde-frameworks/prison</pkg></flag>
+		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
 		<flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.0.ebuild
new file mode 100644
index 000000000000..f0d127a1c238
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kpeople-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5[qml]
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=media-libs/phonon-4.11.0
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	appstream? ( dev-libs/appstream[qt5] )
+	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+	gps? ( sci-geosciences/gpsd )
+	qalculate? ( sci-libs/libqalculate:= )
+	screencast? (
+		>=media-video/pipewire-0.3:=
+		x11-libs/libdrm
+	)
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpaths-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-apps/kio-extras-19.04.3:5
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-plasma/ksysguard-${PVCUT}:5
+	>=kde-plasma/milou-${PVCUT}:5
+	>=kde-plasma/plasma-integration-${PVCUT}:5
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	systemd? ( sys-apps/dbus[user-session] )
+	!systemd? ( sys-apps/dbus )
+	!<kde-plasma/plasma-desktop-5.19.80:5
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+
+	cmake_comment_add_subdirectory libkworkspace
+	# delete colliding libkworkspace translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
+			-i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_xembed-sni-proxy=OFF
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF5Holidays)
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# default startup and shutdown scripts
+	insinto /etc/xdg/plasma-workspace/env
+	doins "${FILESDIR}"/10-agent-startup.sh
+
+	insinto /etc/xdg/plasma-workspace/shutdown
+	doins "${FILESDIR}"/10-agent-shutdown.sh
+	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	# Clean up pre-5.17.4 dirs
+	rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
+
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 594bbcf156ff..83b90ea5c455 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1 +1,2 @@
 DIST plymouth-kcm-5.19.5.tar.xz 41680 BLAKE2B d9a7a0c5d512322d0a9074e810fd8ebbdc2308985f471280c9c862f71aef77270fc39c9a6a4b4b2e8691c78501496fb101cd288b4b39b638cfc2f8f518ca50b5 SHA512 fbcebcec7ee4c69491b6425c5cac09801a26310ff15bc252bb66bdf8e322734c0d1551b97a4eb3e725e08e70010a0a4949560e2c5a58f61d1aa004620c8ac6cc
+DIST plymouth-kcm-5.20.0.tar.xz 41752 BLAKE2B 72625f7dbde7597841ba6e576f18188e44073c3474adf09f3bbcaf7d10da69c8c8ead468ea8965b162608a0f938fe45f45ca1c89968e173687eadaa003215fba SHA512 7a7444711adec1c48986a50d5dffddba4e399b5528c43bb2d94a9fc29cd76db16ae826ad765bf60157d0b8e866034e8e3d3e6b8fd3749373e6e591624520e088
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.0.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.0.ebuild
new file mode 100644
index 000000000000..543bb572e1f2
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BOGUS=1
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for Plymouth"
+HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	sys-boot/plymouth
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index fb6e5a1d33b1..af898255f321 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1 +1,2 @@
 DIST polkit-kde-agent-1-5.19.5.tar.xz 44824 BLAKE2B 117b1ccd5ec5ec38ec45edd45c33671b30fbea7bf53a444e9e172cad4d88d0165c60e59d9664348422f11930ddb089f574af03eea743c10e85b036702dc7ed3d SHA512 f0e27056af864535c533a2bedbe2445f9e1648789150eac16031a1486f6676f8a4c929fee5f8cfbd7e48a904045f6c2d283083b33bbb823a2da27549d42090a5
+DIST polkit-kde-agent-1-5.20.0.tar.xz 44352 BLAKE2B 384f684c0fabd574daf7339b9e22fe796a4cb78cb99c905c48f59df0374799cca44c07fda2febb5355ca5439bab8c98bde5daea433b610ab63acb6cf200cc213 SHA512 6a3f3e642b8d420d5c1e1d4cfa42d02c03cd4659bf4524705b289227258f92d81a567afa870784e09b8ad70dc3c359f1e6200f1ee81f3e142f32e7707138b52c
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.0.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.0.ebuild
new file mode 100644
index 000000000000..e23f14ac408d
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-1"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="PolKit agent module for KDE Plasma"
+HOMEPAGE="https://kde.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=sys-auth/polkit-qt-0.113.0
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index a07f8afbf4cc..a225c8544e10 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1 +1,2 @@
 DIST powerdevil-5.19.5.tar.xz 600388 BLAKE2B 0b99c229b576d8a033187dd81a0f6f199ff991f9c1eb4c6856a77a7ddd269ddf1ce50a76ea71821487be11593f5740a7d66a2af3e6b6c1f983a5e87bfc008b9b SHA512 5f1b1e8fdcd996769024a4f008527960fc91af32862047fdd13674ddb6925fd7b1a024a5c45182d14be32aa0bb8ba1bc694476061e480bcdfb3bdcb65d60cb16
+DIST powerdevil-5.20.0.tar.xz 606232 BLAKE2B 77f4c88431e6050703510d230a4a2298ff9ab2835bac5909ec785219c8ed584f9ba39a8add9bb94a0859356c37f75ba965c0175a44bc96137a14b31313129b25 SHA512 09d0893ba0876fc7e1a90cde315cf3aefe3028b99fe3b7edd9fcf7f37b1552175b6514b9a49a68878497215d1ee73938c3efa8b63ddeb4e3be8aeb96b6d640c3
diff --git a/kde-plasma/powerdevil/powerdevil-5.20.0.ebuild b/kde-plasma/powerdevil/powerdevil-5.20.0.ebuild
new file mode 100644
index 000000000000..4bd73a392c96
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.20.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="brightness-control caps +wireless"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil )
+	caps? ( sys-libs/libcap )
+	wireless? (
+		>=kde-frameworks/bluez-qt-${KFMIN}:5
+		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=sys-power/upower-0.9.23
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_DDCUTIL=$(usex brightness-control)
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package wireless KF5BluezQt)
+		$(cmake_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 3fcf5af492f1..4a21fcf7f180 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1 +1,2 @@
 DIST sddm-kcm-5.19.5.tar.xz 62468 BLAKE2B e02a9c839cfaeb8d90a9bb317a6025be9d65399963a4ffbff562572bcf722d499cd20e007f13614f609ffce75322ee6b834b0cc760dd59d35952bbde22d85ecc SHA512 5eb79696addcb08e8c6eb95960a43cfd7ec5013a7948d67b025430fd09ad20917a71e903b5a2b0b0f1d47e7dbce7473cfa69dd143b9c6b2f4fbb8828cdd86704
+DIST sddm-kcm-5.20.0.tar.xz 63440 BLAKE2B 523c56058ce1bf6de8002fd926c4cc30e0e585375f651aecbe482fb796fee21434038ae9a47a7baa1a3313bd18c83064b2a713c8ec4cf43bc1f09c48a7539c45 SHA512 57694ce045bb24d1cbf054140c8bc07cdf28adf81726951e542acaaa393d4d575da5a203878a1f0f86f528f5648d22dd12450e9ba954f2e60adaeda5df6a3cd6
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.20.0.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.20.0.ebuild
new file mode 100644
index 000000000000..fb47d52771be
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.20.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for SDDM"
+HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	x11-misc/sddm
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 842b573afca6..d91dd4b8f605 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1 +1,2 @@
 DIST systemsettings-5.19.5.tar.xz 183360 BLAKE2B dc8eb9b466f2f86405175e29e7abf54a243e64022222f5e8a370d17bedcf44a5b35e760b0f2f9a7da67a5845d68a77049d7d2ba405f2574b4676a42fea0b0676 SHA512 381aa73e5bc195f2c05cf4df904a031f8415fffb99eaf33414604bdb623e8618c66ffa2e5b108b7838f5d9cb83cec578cefa4e414d9d7fa3fe258c864e1568fb
+DIST systemsettings-5.20.0.tar.xz 703036 BLAKE2B 8d304976f417c84c0464c48b42d08fac1933aaba9295cf2d7a97aadb1c5d63a561c1c7c2b610482c161040ed645cb5fb70c7bb016873c7ab36ad4927b1c7814e SHA512 7e2f1f6b4a33547310167e6925f2631e700607acc1bfe3e7a68d2085ad027b433d687c25da192f006d05755435941bf8e05a6ea44256d9ccc352082024ee2c1e
diff --git a/kde-plasma/systemsettings/systemsettings-5.20.0.ebuild b/kde-plasma/systemsettings/systemsettings-5.20.0.ebuild
new file mode 100644
index 000000000000..97ac1db64e27
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.20.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Control Center to configure KDE Plasma desktop"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	!kde-misc/systemd-kcm
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index bc3bb11f5a34..f1064fc918e5 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1 +1,2 @@
 DIST xdg-desktop-portal-kde-5.19.5.tar.xz 76348 BLAKE2B d3205542ec76bd6c9fa4ae5076d0716c1f201f8c90aeeb61dfcaf9010ada0b21a3e80cff70089077646059d56d19033f8ae887b34c9f30c54b8190d559df0a09 SHA512 5d82e5a1553e9fcb471895e356a23915cbad1215ae1fff5fa6fac6f1673af4c406171131222a88a13eee847dc0d99f8bab00dac1849dfa6844b1672ae7545bb7
+DIST xdg-desktop-portal-kde-5.20.0.tar.xz 80792 BLAKE2B a4b93d33c066b5af37cc869b2d697ce75d7c6c210e870cdf8ecea25d509ecc9af488f9d02b6c26d051dfbb4b21ff4a4b2bcc4d86b1c65ac1bde15ae1473de18a SHA512 7aeee7085fc194c52c0a1d4b3c5c8569cc29cdda3dde8562e3ba57de1b205da68ce41234afcd916dba070c3d5643001183e2b5c6913b9f775d3a61f7808532e6
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.0.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.0.ebuild
new file mode 100644
index 000000000000..0401c0d06978
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/xdg-desktop-portal
+"
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 764bc8aa0d6b..4991332bbe53 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1 +1,2 @@
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
+DIST plasma-workspace-5.20.0.tar.xz 8991780 BLAKE2B 40e57968595b53c63f91bf58fd7714586a9cc1caf2e5cbddc94463699383997e4067b1250fd62a6b2acd6aea6ac0b0e7539920b85aa6f2b95017e5495a68e4c2 SHA512 3b49ad852a1c2cfb1b4f304a25423506825b94ca80809e0e9ea55e1efa100b0b5411b3591087c35750f971e78dc640d851a367fae7c33902d02610d21511a613
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.0.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.0.ebuild
new file mode 100644
index 000000000000..7fbf12903ee7
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.1
+inherit cmake kde.org
+
+DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+"
+RDEPEND="${DEPEND}
+	!<kde-plasma/plasma-workspace-5.14.2:5
+	!kde-plasma/xembed-sni-proxy:0
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
+		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 182eb3d7a87e..75a8baf59174 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/milter-regex/milter-regex-2.7.ebuild b/mail-filter/milter-regex/milter-regex-2.7.ebuild
index b8a5df416985..e2b98ff9e61f 100644
--- a/mail-filter/milter-regex/milter-regex-2.7.ebuild
+++ b/mail-filter/milter-regex/milter-regex-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.benzedrine.ch/milter-regex.html"
 SRC_URI="https://www.benzedrine.ch/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="acct-user/milter-regex
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 333b4e763ec7..183eba3aef35 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 65b1492d8b1b..bb2ae2c5f9f6 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.2.9.tar.xz 170082028 BLAKE2B dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66 SHA512 66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
 DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c SHA512 5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4
diff --git a/media-gfx/krita/files/krita-4.2.4-tests-optional.patch b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
deleted file mode 100644
index 2f13c999b67e..000000000000
--- a/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
+++ /dev/null
@@ -1,399 +0,0 @@
---- a/plugins/filters/CMakeLists.txt	2019-07-31 11:22:19.572862843 +0200
-+++ b/plugins/filters/CMakeLists.txt	2019-07-31 11:22:19.576862870 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
---- a/plugins/filters/unsharp/CMakeLists.txt	2019-07-31 11:22:19.582862912 +0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt	2019-07-31 11:22:19.587862947 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaunsharpfilter_SOURCES
-     unsharp.cpp
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-07-31 11:22:19.592862983 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-07-31 11:22:19.595863003 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
- 
- include_directories(brush
-                     duplicate
---- a/plugins/paintops/libpaintop/CMakeLists.txt	2019-07-31 11:22:19.600863038 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt	2019-07-31 11:22:19.603863060 +0200
-@@ -104,4 +104,6 @@
- install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/dockers/lut/CMakeLists.txt	2019-07-31 11:22:19.608863094 +0200
-+++ b/plugins/dockers/lut/CMakeLists.txt	2019-07-31 11:22:19.613863129 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${OCIO_INCLUDE_DIR}
---- a/plugins/dockers/animation/CMakeLists.txt	2019-07-31 11:22:19.619863171 +0200
-+++ b/plugins/dockers/animation/CMakeLists.txt	2019-07-31 11:22:19.624863206 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- set(KRITA_ANIMATIONDOCKER_SOURCES
---- a/plugins/extensions/qmic/CMakeLists.txt	2019-07-31 11:22:19.630863248 +0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt	2019-07-31 11:22:19.635863283 +0200
-@@ -20,4 +20,6 @@
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/tools/basictools/CMakeLists.txt	2019-07-31 11:22:19.641863325 +0200
-+++ b/plugins/tools/basictools/CMakeLists.txt	2019-07-31 11:22:19.645863353 +0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif ()
- 
- set(kritadefaulttools_SOURCES
---- a/plugins/tools/tool_transform2/CMakeLists.txt	2019-07-31 11:22:19.650863388 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt	2019-07-31 11:22:19.653863409 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- set(kritatooltransform_SOURCES
---- a/plugins/impex/svg/CMakeLists.txt	2019-07-31 11:22:19.658863444 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt	2019-07-31 11:22:19.662863472 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritasvgimport_SOURCES
-     kis_svg_import.cc
---- a/plugins/impex/brush/CMakeLists.txt	2019-07-31 11:22:19.668863514 +0200
-+++ b/plugins/impex/brush/CMakeLists.txt	2019-07-31 11:22:19.672863542 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritabrushexport_PART_SRCS
-     kis_brush_export.cpp
---- a/plugins/impex/psd/CMakeLists.txt	2019-07-31 11:22:19.678863584 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt	2019-07-31 11:22:19.684863626 +0200
-@@ -1,5 +1,7 @@
- if (NOT MSVC AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
---- a/plugins/impex/tga/CMakeLists.txt	2019-07-31 11:22:19.690863668 +0200
-+++ b/plugins/impex/tga/CMakeLists.txt	2019-07-31 11:22:19.695863703 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritatgaexport_SOURCES
-     kis_tga_export.cpp
---- a/plugins/impex/libkra/CMakeLists.txt	2019-07-31 11:22:19.700863738 +0200
-+++ b/plugins/impex/libkra/CMakeLists.txt	2019-07-31 11:22:19.704863766 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritalibkra_LIB_SRCS
-     kis_colorize_dom_utils.cpp
---- a/plugins/impex/jpeg/CMakeLists.txt	2019-07-31 11:22:19.709863801 +0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt	2019-07-31 11:22:19.713863829 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
- 
---- a/plugins/impex/gif/CMakeLists.txt	2019-07-31 11:22:19.720863878 +0200
-+++ b/plugins/impex/gif/CMakeLists.txt	2019-07-31 11:22:19.726863920 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritagifexport_SOURCES
-     kis_gif_export.cpp
---- a/plugins/impex/exr/CMakeLists.txt	2019-07-31 11:22:19.732863962 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt	2019-07-31 11:22:19.736863990 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
- 
---- a/plugins/impex/xcf/CMakeLists.txt	2019-07-31 11:22:19.740864018 +0200
-+++ b/plugins/impex/xcf/CMakeLists.txt	2019-07-31 11:22:19.744864046 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
- 
---- a/plugins/impex/tiff/CMakeLists.txt	2019-07-31 11:22:19.750864088 +0200
-+++ b/plugins/impex/tiff/CMakeLists.txt	2019-07-31 11:22:19.755864123 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(libkritatiffconverter_LIB_SRCS
-     kis_tiff_converter.cc
---- a/plugins/impex/ora/CMakeLists.txt	2019-07-31 11:22:19.762864172 +0200
-+++ b/plugins/impex/ora/CMakeLists.txt	2019-07-31 11:22:19.767864207 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(libkritaconverter_LIB_SRCS
-     ora_converter.cpp
---- a/plugins/impex/heif/CMakeLists.txt	2019-07-31 11:22:19.774864256 +0200
-+++ b/plugins/impex/heif/CMakeLists.txt	2019-07-31 11:22:19.778864284 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}")
---- a/plugins/impex/pdf/CMakeLists.txt	2019-07-31 11:22:19.783864319 +0200
-+++ b/plugins/impex/pdf/CMakeLists.txt	2019-07-31 11:22:19.788864354 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
- 
---- a/plugins/impex/csv/CMakeLists.txt	2019-07-31 11:22:19.796864410 +0200
-+++ b/plugins/impex/csv/CMakeLists.txt	2019-07-31 11:22:19.803864459 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- # import
- 
---- a/plugins/impex/heightmap/CMakeLists.txt	2019-07-31 11:22:19.810864508 +0200
-+++ b/plugins/impex/heightmap/CMakeLists.txt	2019-07-31 11:22:19.819864571 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
---- a/plugins/impex/raw/CMakeLists.txt	2019-07-31 11:22:19.826864620 +0200
-+++ b/plugins/impex/raw/CMakeLists.txt	2019-07-31 11:22:19.830864648 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- if(OPENEXR_FOUND)
- 	include_directories(${OPENEXR_INCLUDE_DIR})
---- a/plugins/impex/qimageio/CMakeLists.txt	2019-07-31 11:22:19.837864697 +0200
-+++ b/plugins/impex/qimageio/CMakeLists.txt	2019-07-31 11:22:19.844864746 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritaqimageioexport_SOURCES
-     kis_qimageio_export.cpp
---- a/plugins/impex/qml/CMakeLists.txt	2019-07-31 11:22:19.851864795 +0200
-+++ b/plugins/impex/qml/CMakeLists.txt	2019-07-31 11:22:19.856864830 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritaqmlexport_SOURCES
-     qml_converter.cc
---- a/plugins/impex/png/CMakeLists.txt	2019-07-31 11:22:19.862864872 +0200
-+++ b/plugins/impex/png/CMakeLists.txt	2019-07-31 11:22:19.867864907 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritapngimport_SOURCES
-     kis_png_import.cc
---- a/plugins/color/lcms2engine/CMakeLists.txt	2019-07-31 11:22:19.872864942 +0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt	2019-07-31 11:22:19.876864969 +0200
-@@ -1,6 +1,8 @@
- project( lcmsengine )
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${LCMS2_INCLUDE_DIR}
---- a/libs/brush/CMakeLists.txt	2019-07-31 11:22:19.881865005 +0200
-+++ b/libs/brush/CMakeLists.txt	2019-07-31 11:22:19.885865033 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(SYSTEM
-     ${EIGEN3_INCLUDE_DIR}
---- a/libs/global/CMakeLists.txt	2019-07-31 11:22:19.890865068 +0200
-+++ b/libs/global/CMakeLists.txt	2019-07-31 11:22:19.896865110 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
---- a/libs/image/CMakeLists.txt	2019-07-31 11:22:19.902865151 +0200
-+++ b/libs/image/CMakeLists.txt	2019-07-31 11:22:19.908865194 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- add_subdirectory( tiles3 )
- 
---- a/libs/image/tiles3/CMakeLists.txt	2019-07-31 11:22:19.913865228 +0200
-+++ b/libs/image/tiles3/CMakeLists.txt	2019-07-31 11:22:19.917865256 +0200
-@@ -1 +1,3 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/odf/CMakeLists.txt	2019-07-31 11:22:19.922865291 +0200
-+++ b/libs/odf/CMakeLists.txt	2019-07-31 11:22:19.926865319 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaodf_LIB_SRCS
-     KoOdf.cpp
---- a/libs/metadata/CMakeLists.txt	2019-07-31 11:22:19.930865347 +0200
-+++ b/libs/metadata/CMakeLists.txt	2019-07-31 11:22:19.934865376 +0200
-@@ -29,4 +29,6 @@
- 
- install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/store/CMakeLists.txt	2019-07-31 11:22:19.940865418 +0200
-+++ b/libs/store/CMakeLists.txt	2019-07-31 11:22:19.944865445 +0200
-@@ -1,6 +1,8 @@
- include_directories(${QUAZIP_INCLUDE_DIRS})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritastore_LIB_SRCS
-     KoDirectoryStore.cpp
---- a/libs/libkis/CMakeLists.txt	2019-07-31 11:22:19.951865495 +0200
-+++ b/libs/libkis/CMakeLists.txt	2019-07-31 11:22:19.958865544 +0200
-@@ -47,4 +47,6 @@
- install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/widgetutils/CMakeLists.txt	2019-07-31 11:22:19.968865614 +0200
-+++ b/libs/widgetutils/CMakeLists.txt	2019-07-31 11:22:19.981865705 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
- 
---- a/libs/widgets/CMakeLists.txt	2019-07-31 11:22:19.992865782 +0200
-+++ b/libs/widgets/CMakeLists.txt	2019-07-31 11:22:20.000865837 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
---- a/libs/flake/CMakeLists.txt	2019-07-31 11:22:20.010865908 +0200
-+++ b/libs/flake/CMakeLists.txt	2019-07-31 11:22:20.017865956 +0200
-@@ -9,8 +9,12 @@
- )
- 
- add_subdirectory(styles)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-+if(BUILD_TESTING)
- add_subdirectory(resources/tests)
-+endif()
- 
- set(kritaflake_SRCS
-     KoGradientHelper.cpp
---- a/libs/ui/CMakeLists.txt	2019-07-31 11:22:20.029866040 +0200
-+++ b/libs/ui/CMakeLists.txt	2019-07-31 11:22:20.039866111 +0200
-@@ -7,7 +7,9 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- if (APPLE)
-     find_library(FOUNDATION_LIBRARY Foundation)
---- a/libs/pigment/CMakeLists.txt	2019-07-31 11:22:20.050866188 +0200
-+++ b/libs/pigment/CMakeLists.txt	2019-07-31 11:22:20.057866236 +0200
-@@ -31,7 +31,9 @@
-     message("${__per_arch_factory_objs}")
- endif()
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- add_subdirectory(benchmarks)
- 
- set(kritapigment_SRCS
diff --git a/media-gfx/krita/krita-4.2.9.ebuild b/media-gfx/krita/krita-4.2.9.ebuild
deleted file mode 100644
index 150df39c7060..000000000000
--- a/media-gfx/krita/krita-4.2.9.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
-		https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
-	KEYWORDS="amd64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.4-tests-optional.patch
-	"${WORKDIR}"/${P}-patchset
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake_use_find_package color-management OCIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-4.3.0.ebuild b/media-gfx/krita/krita-4.3.0.ebuild
index 55f079f74824..6bbf5eded0bc 100644
--- a/media-gfx/krita/krita-4.3.0.ebuild
+++ b/media-gfx/krita/krita-4.3.0.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
 		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
index 87c54a14bfc1..35793f715a14 100644
--- a/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pts/sam2p/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="examples gif"
 RESTRICT="test"
 
diff --git a/media-gfx/xfig/xfig-3.2.7b.ebuild b/media-gfx/xfig/xfig-3.2.7b.ebuild
index c1e849310d7e..7afd90d0077f 100644
--- a/media-gfx/xfig/xfig-3.2.7b.ebuild
+++ b/media-gfx/xfig/xfig-3.2.7b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg nls postscript"
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7e305a8b79ad..10d8419b3fb9 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 0da91a6dc58f..05545c81b614 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1,2 +1 @@
-DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
 DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae
diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild
deleted file mode 100644
index 6e2dfe73f617..000000000000
--- a/media-libs/coin/coin-3.1.3-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic
-
-MY_P=${P/c/C}
-
-DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
-HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home"
-SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 PEL )"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="bzip2 debug doc javascript openal simage static-libs threads zlib"
-
-# NOTE: expat is not really needed as --enable-system-expat is broken
-RDEPEND="
-	dev-libs/expat
-	media-libs/fontconfig
-	media-libs/freetype:2
-	virtual/opengl
-	virtual/glu
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	bzip2? ( app-arch/bzip2 )
-	javascript? ( dev-lang/spidermonkey:0 )
-	openal? ( media-libs/openal )
-	simage? ( media-libs/simage )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )
-"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0-javascript.patch
-	"${FILESDIR}"/${P}-pkgconfig-partial.patch
-	"${FILESDIR}"/${P}-gcc-4.7.patch
-	"${FILESDIR}"/${P}-freetype251.patch
-	"${FILESDIR}"/${P}-memhandler-initialization.patch
-	"${FILESDIR}"/${P}-gcc-7.patch
-)
-
-DOCS=(
-	AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS
-	docs/{ChangeLog.v${PV},HACKING,oiki-launch.txt}
-)
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/freetype2"
-	# Prefer link-time linking over dlopen
-	local myeconfargs=(
-		htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		--disable-dl-fontconfig
-		--disable-dl-freetype
-		--disable-dl-libbzip2
-		--disable-dl-openal
-		--disable-dl-simage
-		--disable-dl-zlib
-		--disable-dyld
-		--disable-loadlibrary
-		--disable-man
-		--disable-java-wrapper
-		--enable-3ds-import
-		--enable-compact
-		--enable-dl-glu
-		--enable-dl-spidermonkey
-		--enable-system-expat
-		--includedir="${EPREFIX}/usr/include/${PN}"
-		--with-fontconfig
-		--with-freetype
-		$(use_with bzip2)
-		$(use_enable debug)
-		$(use_enable debug symbols)
-		$(use_enable doc html)
-		$(use_enable javascript javascript-api)
-		$(use_with javascript spidermonkey)
-		$(use_enable openal sound)
-		$(use_with openal)
-		$(use_with simage)
-		$(use_enable threads threadsafe)
-		$(use_with zlib)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	# Remove Coin from Libs.private
-	sed -e '/Libs.private/s/ -lCoin//' -i "${BUILD_DIR}"/Coin.pc || die
-
-	autotools-utils_src_install
-}
diff --git a/media-libs/coin/files/coin-3.1.0-javascript.patch b/media-libs/coin/files/coin-3.1.0-javascript.patch
deleted file mode 100644
index f45d9cd78cf6..000000000000
--- a/media-libs/coin/files/coin-3.1.0-javascript.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: src/vrml97/JS_VRMLClasses.h
-===================================================================
---- src/vrml97/JS_VRMLClasses.h	(revision 13505)
-+++ src/vrml97/JS_VRMLClasses.h	(revision 13506)
-@@ -28,6 +28,7 @@
- #error this is a private header file
- #endif /* ! COIN_INTERNAL */
- 
-+#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT)
- /* ********************************************************************** */
- 
- class SoJavaScriptEngine;
-@@ -37,5 +38,6 @@
- void JS_addVRMLclasses(SoJavaScriptEngine * engine);
- 
- /* ********************************************************************** */
-+#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT
- 
- #endif /* !COIN_JS_VRMLCLASSES_H */
-Index: src/vrml97/JS_VRMLClasses.cpp
-===================================================================
---- src/vrml97/JS_VRMLClasses.cpp	(revision 13505)
-+++ src/vrml97/JS_VRMLClasses.cpp	(revision 13506)
-@@ -2,7 +2,7 @@
- #include "config.h"
- #endif // HAVE_CONFIG_H
- 
--#ifdef HAVE_VRML97
-+#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT)
- 
- /**************************************************************************\
-  *
-@@ -2097,4 +2097,4 @@
-     MFVec3dHandler::jsval2field);
- }
- 
--#endif // HAVE_VRML97
-+#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT
diff --git a/media-libs/coin/files/coin-3.1.3-freetype251.patch b/media-libs/coin/files/coin-3.1.3-freetype251.patch
deleted file mode 100644
index 44e8eefb1f63..000000000000
--- a/media-libs/coin/files/coin-3.1.3-freetype251.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- Coin-3.1.3/src/glue/freetype.cpp
-+++ Coin-3.1.3/src/glue/freetype.cpp
-@@ -52,9 +52,9 @@
- #ifdef HAVE_FREETYPE /* In case we're _not_ doing runtime linking. */
- #define FREETYPEGLUE_ASSUME_FREETYPE 1
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
- #endif /* FREETYPEGLUE_ASSUME_FREETYPE */
- 
- #include <Inventor/C/basic.h>
---- Coin-3.1.3/src/glue/freetype.h
-+++ Coin-3.1.3/src/glue/freetype.h
-@@ -87,8 +87,8 @@
- 
- #ifdef HAVE_FREETYPE
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
- #else /* HAVE_FREETYPE */
- 
- #include <Inventor/C/basic.h>
diff --git a/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch b/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch
deleted file mode 100644
index fd2430903802..000000000000
--- a/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- coin3-3.1.3.orig/include/Inventor/SbBasic.h
-+++ coin3-3.1.3/include/Inventor/SbBasic.h
-@@ -24,6 +24,7 @@
-  *
- \**************************************************************************/
- 
-+#include <Inventor/C/errors/debugerror.h>
- #include <Inventor/C/basic.h>
- 
- /* ********************************************************************** */
diff --git a/media-libs/coin/files/coin-3.1.3-gcc-7.patch b/media-libs/coin/files/coin-3.1.3-gcc-7.patch
deleted file mode 100644
index c1f1f560d851..000000000000
--- a/media-libs/coin/files/coin-3.1.3-gcc-7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN Coin-3.1.3.orig/src/3ds/SoStream.cpp Coin-3.1.3/src/3ds/SoStream.cpp
---- Coin-3.1.3.orig/src/3ds/SoStream.cpp	2010-03-02 16:20:09.000000000 +0300
-+++ Coin-3.1.3/src/3ds/SoStream.cpp	2017-07-23 15:04:43.808204691 +0300
-@@ -176,7 +176,7 @@
-   if (!gotNum) { setBadBit(); return FALSE; } \
-  \
-   char *ce; \
--  s = '\0'; \
-+  s = NULL; \
-   _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \
-  \
-   if (ce != s) \
-@@ -273,7 +273,7 @@
- gotAll: \
-   \
-   char *ce; \
--  s = '\0'; \
-+  s = NULL; \
-   double tempVal = _convertFunc_(buf, &ce); \
-  \
-   if (ce != s) \
diff --git a/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch b/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch
deleted file mode 100644
index 892882b6a3db..000000000000
--- a/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=619378
-Patch http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/tree/0012-memhandler-initialization.patch?id=ca89ec7227943bdec800ee51b920f578fab87b05
-
---- a/src/misc/SbHash.h
-+++ b/src/misc/SbHash.h
-@@ -89,6 +89,8 @@
-     cc_memalloc_deallocate(entry->memhandler, ptr);
-   }
-   SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
-+  SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler)
-+		: key(key), obj(obj), memhandler(memhandler) {}
-
-   Key key;
-   Type obj;
-@@ -218,7 +220,7 @@
-     /* Key not already in the hash table; insert a new
-      * entry as the first element in the bucket
-      */
--    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
-+    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
-     entry->next = this->buckets[i];
-     this->buckets[i] = entry;
-
diff --git a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch b/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
deleted file mode 100644
index 3fd3bca726d4..000000000000
--- a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru ../Coin-3.1.3/Coin.pc.in ./Coin.pc.in
---- Coin.pc.in	2010-03-02 14:20:09.000000000 +0100
-+++ Coin.pc.in	2010-06-28 19:27:59.634534460 +0200
-@@ -10,7 +10,8 @@
- Version: @COIN_VERSION@
- Requires:
- Conflicts:
--Libs: -L${libdir} @COIN_EXTRA_LDFLAGS@ @COIN_EXTRA_LIBS@
-+Libs: -L${libdir} -lCoin
-+Libs.private: -L${libdir} @COIN_EXTRA_LIBS@
- Cflags: -I${includedir} @COIN_EXTRA_CFLAGS@ @COIN_EXTRA_CPPFLAGS@
- 
- coin_host=@host@
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index 11c05aeb8175..f76f33813aaf 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -8,9 +8,8 @@
     <flag name="exceptions">Compile with C++ exceptions</flag>
     <flag name="man">Build and install man pages</flag>
     <flag name="qthelp">Build API documentation in QtHelp format</flag>
-    <flag name="simage">Texture loading via <pkg>media-libs/simage</pkg> library</flag>
   </use>
   <upstream>
-    <remote-id type="bitbucket">Coin3D/coin</remote-id>
+    <remote-id type="github">coin3d/coin</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/media-libs/libaom/libaom-2.0.0.ebuild b/media-libs/libaom/libaom-2.0.0.ebuild
index baa8a33d2747..a11cb13d5052 100644
--- a/media-libs/libaom/libaom-2.0.0.ebuild
+++ b/media-libs/libaom/libaom-2.0.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.gz"
 	S="${WORKDIR}"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libdca/libdca-0.0.7.ebuild b/media-libs/libdca/libdca-0.0.7.ebuild
index 64d6a490a586..f284b8597bd5 100644
--- a/media-libs/libdca/libdca-0.0.7.ebuild
+++ b/media-libs/libdca/libdca-0.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug oss"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index 0babced10ea9..0d5d3e6acfb2 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,2 +1 @@
-DIST liblscp-0.6.0.tar.gz 670650 BLAKE2B 0cb825743fac7b328c32844f834d59e6622fcb9d860e9a13732d5548ce1f6bd0136928ea5be9b1de0a2811878c38b2e714823973c7a340d99de4735d6c46f637 SHA512 64c5cb51ac7821d65a8769415deb68cefa24684e1d4fa592a68c7e45cf2af02ffa41a2f2300ffc98a6d1d6d880279aa1b61499ac0fe59177c60fc0a2075ada15
 DIST liblscp-0.6.2.tar.gz 689354 BLAKE2B ecc365e8840c8179bd753b8b9ee2706daea7e12948fb079d1b39a4aab388204af5ecab381e27ac8f5feedcbb56fd02a5a236ff8da7041f213a7551d5cd0cb3cc SHA512 672ea452e5dfe5e34dc6a1cc8c9d40dacfd1a415fc4c3ba50b984d3cf064910da53c814dd43a572665c1cbb7a402a09225c0dc7d489b1589c2a98a3f8eb8f0db
diff --git a/media-libs/liblscp/liblscp-0.6.0.ebuild b/media-libs/liblscp/liblscp-0.6.0.ebuild
deleted file mode 100644
index 6ae6106ea6da..000000000000
--- a/media-libs/liblscp/liblscp-0.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ library for the Linux Sampler control protocol"
-HOMEPAGE="https://www.linuxsampler.org"
-SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog TODO NEWS README )
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/liblscp/liblscp-0.6.2.ebuild b/media-libs/liblscp/liblscp-0.6.2.ebuild
index 30ab5c789415..42b207f10318 100644
--- a/media-libs/liblscp/liblscp-0.6.2.ebuild
+++ b/media-libs/liblscp/liblscp-0.6.2.ebuild
@@ -10,7 +10,7 @@ https://download.linuxsampler.org/packages/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 9db284ba89cc..fc722694e74d 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,2 +1,3 @@
 DIST libmediainfo_20.03.tar.xz 1799940 BLAKE2B a0c50ab27e29b010e33334c207872aefc110396401065d3bebdc6cf34aba325453b87e9f1f1ecfe9882bf5f63aaa26f3bbfe3d791cb0c16fa75ca4bb7ff081f0 SHA512 97dd847edf0e290f7ea0153c71a442cc54944bf295f195486f37fa81230cf4463ae2ecc154e73cf75b876b33c038020a9ff082013d57381ab5516a4a2db5ef87
 DIST libmediainfo_20.08.tar.xz 1808948 BLAKE2B 90af512dc5787f01b3600852f275ed0c0e9e1d5393fc60bdb128045e11947873622f1d78f79eba7a4abd46e4537001b66e41f79008ff895680a016e22c5855fc SHA512 c68b7eb906eac2af7b6f588910824ea9a9bd32d4e7b4f8af3579b0e388f5c547583be0ebd1491cdef52dbdb0eca7e2b2731662e48fc66baaddc1e1ca76f385ff
+DIST libmediainfo_20.09.tar.xz 1827744 BLAKE2B 4073da6b85a2871e815a3a374933bae614c25899f8ad77174f63b2055d2220f8b5b785a765f85583289398ce9ade7c014da4d19303b6ed5224e13ffcc2952fdb SHA512 dce5b787866984fd0fefdcb739851212d5a145b657a557fd41c19c7548d32449a3b07d7759bf9a790c5ddebdc9537a0b9f0d5c58b8b2fbb152e456386897a354
diff --git a/media-libs/libmediainfo/libmediainfo-20.09.ebuild b/media-libs/libmediainfo/libmediainfo-20.09.ebuild
new file mode 100644
index 000000000000..617f561cf174
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-20.09.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic
+
+MY_PN="MediaInfo"
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms static-libs"
+
+RDEPEND="sys-libs/zlib
+	dev-libs/tinyxml2:=
+	>=media-libs/libzen-0.4.37[static-libs=]
+	curl? ( net-misc/curl )
+	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+# tests try to fetch data from online sources
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
+
+src_prepare() {
+	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
+	eapply_user
+
+	sed -i 's:-O2::' configure.ac || die
+	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--with-libtinyxml2 \
+		$(use_with curl libcurl) \
+		$(use_with mms libmms) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs staticlibs)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
+	fi
+
+	default
+
+	edos2unix ${PN}.pc #414545
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+	done
+
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index dd6ec6f05980..6558cadb2f63 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,2 +1 @@
-DIST libmpdclient-2.16.tar.xz 60480 BLAKE2B ef7a077195b08f24304e08701a303a6709f71792112b096b0e1741f550f215352936f30e05f4afad29c0f7a5e4340e87de6d7fd8cfcd4c27f34eda91c7d21891 SHA512 520568f61cee447e48c04075d212c46e9640fd3f82604a5b9f4c6ded94eeb4a841e857e44e9f4edad12d93c1052692e7d32d3dbf505d4c0cde6cc217cff0cae5
 DIST libmpdclient-2.19.tar.xz 69144 BLAKE2B c045c4847d43f166a3e1549654784bd994fa4156e3ecebf7c02a412b34ca150940f3c43cdc385839cd7c281bd4ed4fd1935b757d8505133d146ea955ec2d0832 SHA512 5d67b95d4b615bc750641f6d5a0240122e8f59c66108838a96bd4bc5cdda8b15288ad03d0e35d92d6e562e67c600f68aad643ca541092121074952a1bc5b3590
diff --git a/media-libs/libmpdclient/libmpdclient-2.16.ebuild b/media-libs/libmpdclient/libmpdclient-2.16.ebuild
deleted file mode 100644
index d6d682adc180..000000000000
--- a/media-libs/libmpdclient/libmpdclient-2.16.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	doc? ( app-doc/doxygen )
-	test? ( dev-libs/check )
-"
-
-src_prepare() {
-	default
-
-	sed -i "s:@top_srcdir@:.:" doc/doxygen.conf.in || die
-
-	# meson doesn't support setting docdir
-	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-		-e "/^install_data(/s/'COPYING', //" \
-		-i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=$(usex doc true false)
-		-Dtest=$(usex test true false)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	use examples && dodoc src/example.c
-	use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
-}
diff --git a/media-libs/libmpdclient/libmpdclient-2.19.ebuild b/media-libs/libmpdclient/libmpdclient-2.19.ebuild
index cb44ec2a3919..b8ac71b8c473 100644
--- a/media-libs/libmpdclient/libmpdclient-2.19.ebuild
+++ b/media-libs/libmpdclient/libmpdclient-2.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 ~sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libpgf/Manifest b/media-libs/libpgf/Manifest
index 628d2992e3af..2b74db9e51f0 100644
--- a/media-libs/libpgf/Manifest
+++ b/media-libs/libpgf/Manifest
@@ -1,2 +1 @@
-DIST libpgf-6.12.27.tar.bz2 1235651 BLAKE2B d155289398d6291d49a217a97e283d28440e398c330b3bb1006cdb2cf4c31bd7efef5db4cadd9d28812ffe4ef6deb12ab978b8feaac7c9119cff61ee26658628 SHA512 ad06b34d61219a61d06b87e05a26e8639cd7a93211943217832969c03c4dbc81fbbb287fa2d628b7e087b96e78665a3cbc78920c8ff5828dfb2a7748e04fe42a
 DIST libpgf-7.19.3.zip 1303189 BLAKE2B 129ec655241f0a152814b412c1ee5d40fc5b89daef172d1e73985e49f8ffec22ce87c6aa893dbf330b5176370d985ffd0c6a015adfbb9faf72131bc63cf0c94d SHA512 68f9734b51372f7bb39b35cf99425bac6f9cf29f0351dba8813742c41f62f394798c92f674803d1315456a9337c7af03479d43455a9e611c07f5cf47ab3e5b58
diff --git a/media-libs/libpgf/libpgf-6.12.27.ebuild b/media-libs/libpgf/libpgf-6.12.27.ebuild
deleted file mode 100644
index f63845ebade5..000000000000
--- a/media-libs/libpgf/libpgf-6.12.27.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library to load, handle and manipulate images in the PGF format"
-HOMEPAGE="https://www.libpgf.org/"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-BDEPEND="
-	app-arch/unzip
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	default
-
-	if ! use doc; then
-		sed -i -e "/HAS_DOXYGEN/{N;N;d}" Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libpgf/libpgf-7.19.3.ebuild b/media-libs/libpgf/libpgf-7.19.3.ebuild
index 494a98b72c9f..b54109c076ff 100644
--- a/media-libs/libpgf/libpgf-7.19.3.ebuild
+++ b/media-libs/libpgf/libpgf-7.19.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/libpgf/libpgf/${PV}-latest/li
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"
 
 BDEPEND="
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
index 81ad80dcdc9b..70b6ee8e597e 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/media-libs/libtimidity/libtimidity-0.2.6.ebuild b/media-libs/libtimidity/libtimidity-0.2.6.ebuild
index 1df379021615..14fc66562e1a 100644
--- a/media-libs/libtimidity/libtimidity-0.2.6.ebuild
+++ b/media-libs/libtimidity/libtimidity-0.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="ao debug"
 
 RESTRICT="test"
diff --git a/media-libs/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest
index 8b2be2e28b3a..d7526911f2c6 100644
--- a/media-libs/nv-codec-headers/Manifest
+++ b/media-libs/nv-codec-headers/Manifest
@@ -1,4 +1,5 @@
 DIST nv-codec-headers-10.0.26.0.tar.gz 61978 BLAKE2B 0f91a3e9f0be19658a519ad4d9091aea4e8a59c0a857d997ce49060d84f35ba7fe5f5fc2e19ee63ad054df16df08946990cc70abe867ceefd40867fb3a06f9ee SHA512 707a2151e5045939be69083bca8b8219439e1edb218a3eb3a8f1ebf38e6c8fd9ef2066e5f986c57b63573603c1fa2ae34f24acee118d1f69e39b3d7b747a28f0
+DIST nv-codec-headers-10.0.26.1.tar.gz 62544 BLAKE2B a19d87101fe0bb511383ca6d5f61fe5a8ecce54827a09ae5526d6b546f50cf14368887550f7689180041e8a36b61ba53c103b8a225a7765670b5d97169d62a62 SHA512 18c507d73efc8b7194bcc79a2e25f88c81390d10766511f9b0c4826cb7b9332e9d0f2667441dd5529575dd1d2c0e0625304ee489c643c9f66ec90f2dbab566c9
 DIST nv-codec-headers-8.1.24.2.tar.gz 53627 BLAKE2B 482c86824f81652b439fba1b765261de107d51a3bd780d3f0c58e1cdd53cd21ddad3fea59e8ab5d920fb34c73e43c10c007a5efe32024bfd3523ed8d4ad26f44 SHA512 daa45ae8bcc11eb6b8d671c2d720d5c3edce9e4ef68f913ed25a8c4d1a4b165e0576b03eff9ce2fe355156ab5a5d8d74573158ef190feec5cfb5ac0838e0caa7
 DIST nv-codec-headers-9.0.18.1.tar.gz 58850 BLAKE2B 8e940ffb929f67c4e459cfd55113298527cf8430b94d20e9bb7148cf532dbed798138e63801f29d168d0b4b465c0eb6ef3c58596289063f461b7d5e8832ce7e8 SHA512 4306ee3c6e72e9e3172b28c5e6166ec3fb9dfdc32578aebda0588afc682f56286dd6f616284c9892907cd413f57770be3662572207a36d6ac65c75a03d381f6f
 DIST nv-codec-headers-9.1.23.1.tar.gz 59400 BLAKE2B a4f437b5abc8bac05bafde4f01a4fa42f7acf2fd4a1d8b7e58f6a5a5e54c95a6ef9d6b510829bed9ed63f804220de460adc6441bf3c0bd451774dacc6f11e43e SHA512 0c1112cb1db98f60e64eeee24e3592b65c31ea8a808de707d4d0a56efb71c9a483bb3af45a641bff1f8422ab44e6be4bffd548b6567305021a448bcd66202b29
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild
new file mode 100644
index 000000000000..74d91fe786d8
--- /dev/null
+++ b/media-libs/nv-codec-headers/nv-codec-headers-10.0.26.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="FFmpeg version of headers required to interface with Nvidias codec APIs"
+HOMEPAGE="https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git"
+SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=x11-drivers/nvidia-drivers-445.87[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	multilib_copy_sources
+	default
+}
+
+multilib_src_compile() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)"
+}
+
+multilib_src_install() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="$(get_libdir)" DESTDIR="${D}" install
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index f2ea4abe0e0a..d3190cf38559 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/live/live-2020.05.15.ebuild b/media-plugins/live/live-2020.05.15.ebuild
index 49ca6245f945..6931138ac693 100644
--- a/media-plugins/live/live-2020.05.15.ebuild
+++ b/media-plugins/live/live-2020.05.15.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.live555.com/"
 SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="libressl ssl"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 56b6839a82b4..39e26594bc2e 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index ec10b52bb77c..aded7a7e5b5b 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,2 +1 @@
-DIST qsynth-0.6.2.tar.gz 383146 BLAKE2B 6e93a1d16dc57ce5cc180932eec049cbd62eb64d6667cbfc748c474fe2b751273ff50a94a5497f1d268e2d413831095bea92a2f086b417625f02fecf1bc6ec9d SHA512 6e6f5dc64c39ab18ad1a9e791376e0dcf6eea4882986b1723a5a2f7c53309ce166d443a198c62b33ac31ed3fc17100c3a4f8e3b1e474b70afcec0ffa7f1ffc08
 DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4cf51d391562b5226ddde70dad0a3f641f0fcf54f35c6bb1a9e487a779c22237b0c8087666b7a2c1dea8a511e SHA512 7320a355b5fbb347b04b46fdfe86c13ab18b264cff09f2ed133e2b065febac27e58bd709eea284b4d0f98034059647ad6e9b97638fdd75edb1524fd3cf9f07a2
diff --git a/media-sound/qsynth/qsynth-0.6.2.ebuild b/media-sound/qsynth/qsynth-0.6.2.ebuild
deleted file mode 100644
index c820943f1db3..000000000000
--- a/media-sound/qsynth/qsynth-0.6.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	append-cxxflags -std=c++11
-	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
-	econf \
-		$(use_enable debug)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${ED}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/qsynth/qsynth-0.6.3.ebuild b/media-sound/qsynth/qsynth-0.6.3.ebuild
index 3978c5523060..2e469dea3b30 100644
--- a/media-sound/qsynth/qsynth-0.6.3.ebuild
+++ b/media-sound/qsynth/qsynth-0.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-sound/quimup/Manifest b/media-sound/quimup/Manifest
index fee52fb016ab..8d9ef1e44251 100644
--- a/media-sound/quimup/Manifest
+++ b/media-sound/quimup/Manifest
@@ -1,2 +1 @@
 DIST Quimup_1.4.4_source.tar.gz 240902 BLAKE2B a411653b1c5ced5dc7f4b9ebe6244380d23cd165eaf2b14760a3f87946094f7ffad3df73afe500c0f8ea8f6d77e690391e78a0403b9436485b4c670de3c3b0da SHA512 4fac921df6e7157952536e1cdda0e468b72f70f8f938ccfd5d1a7d286f4b7d7ac063ca2c6111f38fb76b2a6235a323858f2f898165c80702b2c0aaeaff8869c9
-DIST quimup_1.4.3_source.tar.gz 587260 BLAKE2B ee2ce0d9f71c63db73af00fe385d643f5ec08e322137c0c4d372fec68b875587e0f46ca2a46d9afc366afdd29e5381816457e4b3b3891af8c0113c577385aa23 SHA512 fb3727bf5c0f756c888484f7c061da95a1ece15673079ac8e6ffc82289f78cfce3dda7245ae25b1d705ffe057f1b0930baf2338bdfe0f16c900dc1ffd3fef807
diff --git a/media-sound/quimup/quimup-1.4.3.ebuild b/media-sound/quimup/quimup-1.4.3.ebuild
deleted file mode 100644
index 2c80b78db1c2..000000000000
--- a/media-sound/quimup/quimup-1.4.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="A Qt5 client for the music player daemon (MPD) written in C++"
-HOMEPAGE="https://sourceforge.net/projects/quimup/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	>=media-libs/libmpdclient-2.3
-	media-libs/taglib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN^}_${PV}"
-
-DOCS=( changelog FAQ.txt README )
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	default
-	dobin ${PN}
-
-	newicon src/resources/mn_icon.png ${PN}.png
-	make_desktop_entry ${PN} Quimup
-}
diff --git a/media-sound/quimup/quimup-1.4.4.ebuild b/media-sound/quimup/quimup-1.4.4.ebuild
index 83803313c370..074276e6cf8e 100644
--- a/media-sound/quimup/quimup-1.4.4.ebuild
+++ b/media-sound/quimup/quimup-1.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN^}_${PV}_source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 0b7743daf0ac..4e970f4f1b37 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,3 +1,4 @@
 DIST strawberry-0.6.13.tar.xz 10156576 BLAKE2B 04d27d8a96a8664348623c11f393324b410f8224b22089e200947cfd90eaafe04c3aa13cc5345a7c95d83d24ed04ec9221a8badfb2e3dc42922739b568fc2e90 SHA512 b3db58a30d50f74b313c0af5a492ea809d631c4152f856b19debb5f811688eb21d97ba35b58f3f1d00779fcd76220d88b4dafc32520416f7e749c6680257ad49
 DIST strawberry-0.7.2.tar.xz 10123596 BLAKE2B cfd3384ded94bc5e638d79e4dea8e4a04a42abcc36d1d34da5d39150c2f20e785fd5f199c91ca515d02391e90acd23d1a5d90602ec07f52fdfa711d3ec88bc0e SHA512 d664ce81c2eef2e1bbbbdda40e420142c6c0bf6df42a785cc1c7f572f9b7521e44161f93c4694434db8752d7056df946e6e2aa064a62f45b143da6860f007483
 DIST strawberry-0.8.1.tar.xz 10278268 BLAKE2B 41b278449d4a2e6efcf9b369b28cf4705cc21daaadd106dbd94668a3aeffbeba8d3c31f50107248a40983e368ddb0e4cc4a05362dc10fc41ca8a138e4e652436 SHA512 99c4c11cdb540ec36285b7e6e7fba65d69aa8eb125fba2cf8a053c61adf9e987d415a35fa4dbf76a580a73296cfe2e4072a2872f821810d826292cdae47941b3
+DIST strawberry-0.8.2.tar.xz 10280568 BLAKE2B 16af6602137e7e8623dbb7b39610fc574157677078321888f002115c254fbf6c8b8d1b6644a2d064e7eca452cb411abc8ee48ea07b179a0dcd4a352d355bf6ab SHA512 7ff983aa3b8ff5d904af583be28e253be2d59db72d3f4ea4b4b13bad934fd91052028fddfd52ee1c316d6b8e54b42c44e7e33312f0d8d4d9027e1c529a716c38
diff --git a/media-sound/strawberry/strawberry-0.8.2.ebuild b/media-sound/strawberry/strawberry-0.8.2.ebuild
new file mode 100644
index 000000000000..92c336d58feb
--- /dev/null
+++ b/media-sound/strawberry/strawberry-0.8.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic l10n virtualx xdg
+
+PLOCALES="cs de es fr hu id it ko nb pl ru"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawbs.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/jonaski/strawberry.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jonaski/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda +dbus debug ipod mms mtp pulseaudio +udisks"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+)]
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-libs/chromaprint:=
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	>=media-libs/taglib-1.11.1_p20181028
+	media-video/vlc
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	dbus? ( dev-qt/qtdbus:5 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+"
+
+DOCS=( Changelog README.md )
+
+src_prepare() {
+	l10n_find_plocales_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+	rm -r 3rdparty/taglib || die
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(l10n_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DUSE_SYSTEM_TAGLIB=ON
+		-DWITH_QT6=OFF
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 79022d2a18c9..8299e872d6b5 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,2 +1 @@
-DIST yoshimi-1.7.1.tar.gz 10067045 BLAKE2B 6a9d84d47413ec26c733515bd3becaca436c8168f0f22d2b71f502fde126aa5347ee55d60a74473936933f4831e9feec21c2ebc6916cdde2b2822ecddf3da4c5 SHA512 d422c08caa6bf20665442b2d88fc4ccc41b881d719d5150d1cd3d2617f2216b18c112107c5723cb1077da0ba2278a3eb2db0a8dda4ce3c6315e3875cbfaf421c
 DIST yoshimi-1.7.2.tar.gz 10256155 BLAKE2B e330e2d22117bbed2c2054efabf852aa67141a40539ca96e2df7c88cedabb445214f2d79c0f681b68d70b8c832b7bb7852d44442d3f6b1e4183fd2297768b0ca SHA512 7a52dd847cfd19c6b7cb802f181baaa291e73b52f8243e34f9899651f003779b402a20281995ce24f2335570191f6973c2bafb58a5093eba868033b6b9dd4fd9
diff --git a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch b/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
deleted file mode 100644
index 94e225e4f48f..000000000000
--- a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.cpp b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-index 3502689..9be6128 100644
---- a/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-+++ b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-@@ -378,7 +378,7 @@ bool YoshimiLV2Plugin::init()
- }
- 
- 
--LV2_Handle	YoshimiLV2Plugin::instantiate (const struct _LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
-+LV2_Handle	YoshimiLV2Plugin::instantiate (const struct LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
- {
-     SynthEngine *synth = new SynthEngine(0, NULL, true);
-     if (synth == NULL || !synth->getRuntime().isRuntimeSetupCompleted()){
-@@ -711,9 +711,9 @@ bool YoshimiLV2PluginUI::init()
- }
- 
- 
--LV2UI_Handle YoshimiLV2PluginUI::instantiate(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
-+LV2UI_Handle YoshimiLV2PluginUI::instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
- {
--    const _LV2UI_Descriptor *desc = descriptor;
-+    const LV2UI_Descriptor *desc = descriptor;
-     descriptor = desc;
-     const char *plug = plugin_uri;
-     plugin_uri = plug;
-diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.h b/src/LV2_Plugin/YoshimiLV2Plugin.h
-index a484a8b..47f4729 100644
---- a/src/LV2_Plugin/YoshimiLV2Plugin.h
-+++ b/src/LV2_Plugin/YoshimiLV2Plugin.h
-@@ -106,7 +106,7 @@ public:
-    virtual void registerAudioPort(int) {}
- 
-    //static methods
--   static LV2_Handle	instantiate (const struct _LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
-+   static LV2_Handle	instantiate (const struct LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
-    static void connect_port(LV2_Handle instance, uint32_t port, void *data_location);
-    static void activate(LV2_Handle instance);
-    static void deactivate(LV2_Handle instance);
-@@ -159,7 +159,7 @@ public:
-     YoshimiLV2PluginUI(const char *, LV2UI_Write_Function, LV2UI_Controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-     ~YoshimiLV2PluginUI();
-     bool init();
--    static LV2UI_Handle	instantiate(const struct _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-+    static LV2UI_Handle	instantiate(const struct LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-     static void cleanup(LV2UI_Handle ui);
-     static void static_guiClosed(void *arg);
-     void run();
diff --git a/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild b/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
deleted file mode 100644
index 4c2573a12e31..000000000000
--- a/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg flag-o-matic
-
-DESCRIPTION="Software synthesizer based on ZynAddSubFX"
-HOMEPAGE="https://yoshimi.github.io/"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lv2"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/mxml-2.5
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libsndfile
-	sci-libs/fftw:3.0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/jack
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-DOCS=( Changelog README.txt )
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.1-fix-LV2_Descriptor.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-	append-cxxflags -lpthread
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=( -DLV2Plugin=$(usex lv2) )
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	mv "${D}"/usr/share/doc/yoshimi "${D}"/usr/share/doc/${P}
-}
diff --git a/media-sound/yoshimi/yoshimi-1.7.2.ebuild b/media-sound/yoshimi/yoshimi-1.7.2.ebuild
index 04681dc2a67a..0d9ef3eefcc6 100644
--- a/media-sound/yoshimi/yoshimi-1.7.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 3aba63082ddb..4464561a4f5e 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index f6f9a7f907e9..b2baf1a0f95d 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1 +1,2 @@
 DIST ffmpegthumbnailer-2.2.0.tar.bz2 1223895 BLAKE2B 1babd01672f927a9ae043488e67225490f732b26544ad92e4c55ae683eb7d852cb90233e76a52cbda2f6aec26654b57907d7706e3ad4ae6d76ca3bca163c78eb SHA512 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf
+DIST ffmpegthumbnailer-2.2.2.tar.bz2 1201838 BLAKE2B 449a876eaf56feb41c06dc5f3d123b138d66dfe8b6e1bc2e53f1742ef6fbd4ec5d14d77402e13cf8c369ee0cf0707ae5b100ac1d9fb02435b3c3a776cc9dc5f4 SHA512 52760dcf59430e5e85024c9f19dc1fac1d5f0edb4f937b33feac2b3ca8f12bbf549b5f658fc16fc07bf773717b9e10048aa3eb24bf52811c5c88c995ef492612
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
new file mode 100644
index 000000000000..2ac9daa50b69
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
+HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer"
+SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gnome gtk jpeg png test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="gnome? ( gtk )
+	test? ( png jpeg )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	gtk? ( dev-libs/glib:2= )
+	jpeg? ( virtual/jpeg:0= )
+	>=media-video/ffmpeg-2.7:0=
+	png? ( media-libs/libpng:0= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_prepare() {
+	rm -rf out* || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GIO=$(usex gtk)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_THUMBNAILER=$(usex gnome)
+		-DHAVE_JPEG=$(usex jpeg)
+		-DHAVE_PNG=$(usex png)
+	)
+	cmake_src_configure
+}
diff --git a/media-video/harvid/Manifest b/media-video/harvid/Manifest
index c31d786c66b7..005704db4873 100644
--- a/media-video/harvid/Manifest
+++ b/media-video/harvid/Manifest
@@ -1,3 +1,4 @@
 DIST harvid-0.8.0.tar.gz 116079 BLAKE2B 17e92f9100d4874604d524b31d3bfd50f2b4f1bbd4d53ab82b05e65f4ff7d43176bad2cf57e197d54d4fb1281dc863d6afae50f8b312933014b92def51538dea SHA512 8e999e91e36708df7264fc351e5b6cac6c47fa5e0e612d0917bbfa02e98d13f9758f43312e6febebe56e7b8f2f72b80b6c47598de7100d3b5479b80720b91568
 DIST harvid-0.8.1.tar.gz 116277 BLAKE2B 1382625d241e63f3733817e57be4ad6cc57411aca6fbb7ba472e1b2959362fd384b1e2d1a35594656c30778fae4f54a1c89d1bb6565d006ad801e29c6d657d7d SHA512 b425eca844bb9eec3ec8caa324f783132a3e83938b258a5f8e92ce6dc47108ae491a009223b7e3c8051d965a1ff1b5e5509a804d1462641128a8524cde5ae60a
 DIST harvid-0.8.2.tar.gz 116541 BLAKE2B e3f82ad0b30fa0c1eefe84b85ba658c1897890d2b35aef355dfc029c26140ee5809a42d4e82a2ea515a277f4cc8cd24fdc032f6a42875bcddcb5bd4a77b6282a SHA512 fde352124008cd3d6230950c79a3a2b8d581803f952c7313c941226b00e80f8078053d941f2c5ead04672639a8db696f0c33482f69dab78187801d7ebce23fce
+DIST harvid-0.8.3.tar.gz 116446 BLAKE2B b245166ab2244a7afdddabb463296974c0d995d70ad8af6e93f549f045245597cb4ca3abf47c608eea15089ac5e6f82972b789d9a3f268b8be98f3080fd6e5e7 SHA512 748475602c7279f10790523cbd5cbf34c9cd283ca9e959ac0535fbb5b4ee6d2fcab976c5ddba3fa40862552b49d73df7145f36d26c9fe708063505812537a8ac
diff --git a/media-video/harvid/files/jpeg.patch b/media-video/harvid/files/jpeg.patch
new file mode 100644
index 000000000000..3c0d53bf5d8a
--- /dev/null
+++ b/media-video/harvid/files/jpeg.patch
@@ -0,0 +1,13 @@
+Index: harvid-0.8.3/src/Makefile
+===================================================================
+--- harvid-0.8.3.orig/src/Makefile
++++ harvid-0.8.3/src/Makefile
+@@ -16,7 +16,7 @@ ifeq ($(shell PKG_CONFIG_PATH=$(PKG_CONF
+   $(error "libpng is required - install libpng-dev")
+ endif
+ 
+-ifeq ($(shell $(ECHO) "\#include <stdio.h>\n\#include <jpeglib.h>\nint main() { struct jpeg_error_mgr jerr; jpeg_std_error(&jerr); return 0; }" | $(CC) -pipe -x c -o $(CONFIGTEMP) $(ARCHINCLUDES) $(LDFLAGS) - -ljpeg 2>/dev/null || echo no; $(RM) -f $(CONFIGTEMP)), no)
++ifeq ($(shell printf "#include <stdio.h>\n#include <jpeglib.h>\nint main() { struct jpeg_error_mgr jerr; jpeg_std_error(&jerr); return 0; }" | $(CC) -pipe -x c -o $(CONFIGTEMP) $(ARCHINCLUDES) $(LDFLAGS) - -ljpeg 2>/dev/null || echo no; $(RM) -f $(CONFIGTEMP)), no)
+   $(error "libjpeg is required - install libjpeg-dev, libjpeg8-dev or libjpeg62-dev")
+ endif
+ 
diff --git a/media-video/harvid/harvid-0.8.3.ebuild b/media-video/harvid/harvid-0.8.3.ebuild
new file mode 100644
index 000000000000..d09685d8bc06
--- /dev/null
+++ b/media-video/harvid/harvid-0.8.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="HTTP Ardour Video Daemon"
+HOMEPAGE="http://x42.github.io/harvid/"
+SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=media-video/ffmpeg-2.6:0=
+	media-libs/libpng:0=
+	virtual/jpeg:0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/jpeg.patch" )
+
+hv_make() {
+	emake \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		STRIP="true" \
+		NM="$(tc-getNM) -B" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX:-/}usr" \
+		libdir="${EPREFIX:-/}usr/$(get_libdir)" \
+		hdocdir="${EPREFIX:-/}usr/share/doc/${PF}" \
+		"${@}"
+}
+
+src_compile() {
+	hv_make -C libharvid
+	hv_make -C src
+	hv_make
+}
+
+src_install() {
+	hv_make DESTDIR="${D}" install
+	dodoc ChangeLog README.md
+}
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 0970e4e62a24..cb7ea6aee621 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,2 +1,3 @@
 DIST mediainfo_20.03.tar.xz 1983420 BLAKE2B d0f7557c231bc1cca261e8f002d060b0df4c2063cc32185c315ccc08a94e00fe9f5c0116f8ea65ce1a9df9f159d119264046a9bb607bd25a3b6231092c541799 SHA512 608b86f50139b0cbb21331922447b85dc2012b133915696ca9fceb7f524895f779c8cbfaccfa351c5b79c330587bc48d0f419f4908977fdc3eb4cd0490580399
 DIST mediainfo_20.08.tar.xz 1994480 BLAKE2B bab189f1cd667977c744744bb272f8010c4aec98df62d6517750f8168389fcd20cc237eee2488e27d20e434f8d139b4674f252ca791741053a32ba27893bdf18 SHA512 0d2c2a9987cf5b64093f9492f3c83f5aee0f372375f86511d46d30adcecddbc2e15f8d6c8888abde63a621f05e2fc1d358480bd3eba786d332fbacc868832895
+DIST mediainfo_20.09.tar.xz 1984148 BLAKE2B 6926d9ce787b9f9e5c07fe0ddf98e186139ea25c7ab6b3573dc1732850a7f98aeefdeca2157fdcad83d652332705028df12a1cf1e6377f9c1e23b7865578cfd8 SHA512 b6c8bf661585fa6b8e82c7f4bafacae8505078c5c57bc1c703ed16ac237dad0829569dd33fdaaadccd394bdd93088d9b71e5ad2c2294f75aa641004ec91feca9
diff --git a/media-video/mediainfo/mediainfo-20.09.ebuild b/media-video/mediainfo/mediainfo-20.09.ebuild
new file mode 100644
index 000000000000..dec60a2ece9e
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-20.09.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0"
+
+inherit xdg-utils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="sys-libs/zlib
+	>=media-libs/libzen-0.4.37
+	~media-libs/lib${P}[curl=,mms=]
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/MediaInfo
+
+pkg_setup() {
+	TARGETS="CLI"
+	if use wxwidgets; then
+		TARGETS+=" GUI"
+		setup-wxwidgets
+	fi
+}
+
+src_prepare() {
+	default
+
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		sed -i -e "s:-O2::" configure.ac || die
+		eautoreconf
+	done
+}
+
+src_configure() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		local args=""
+		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+		econf ${args}
+	done
+}
+
+src_compile() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+	done
+}
+src_install() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target} || die
+		default
+		dodoc "${S}"/History_${target}.txt
+	done
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 56053e7d48ec..b3ece3a3b482 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 c1942aa29c96..74d7bbcadf47 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 13 Oct 2020 09:08:22 +0000
+Wed, 14 Oct 2020 13:08:25 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c1942aa29c96..9eff2c63364d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 13 Oct 2020 09:08:22 +0000
+Wed, 14 Oct 2020 13:08:26 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 738aa1ebc264..f1cfc1f76983 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 79bd9f1d1b3f..5b92679d14ee 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/ngxtop-0.0.3_pre141201-r1 b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1
new file mode 100644
index 000000000000..a0be89434eb3
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ngxtop-0.0.3_pre141201-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyparsing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/tabulate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=real-time metrics for nginx server (and others)
+EAPI=7
+HOMEPAGE=https://github.com/lebinh/ngxtop
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyparsing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/tabulate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/ngxtop-0.0.3_pre141201.tar.xz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=731caa7fe831574ff2e17c25542c7c2a
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 92cb0d7d4714..d911af46f53c 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/cardpeek-0.8.4 b/metadata/md5-cache/app-crypt/cardpeek-0.8.4
index ca28902af6ad..1fbe0ba902ea 100644
--- a/metadata/md5-cache/app-crypt/cardpeek-0.8.4
+++ b/metadata/md5-cache/app-crypt/cardpeek-0.8.4
@@ -1,12 +1,14 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=-
-DEPEND=sys-apps/pcsc-lite dev-lang/lua:5.2 x11-libs/gtk+:3 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DEFINED_PHASES=setup
+DEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) sys-apps/pcsc-lite x11-libs/gtk+:3 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 DESCRIPTION=Tool to read the contents of smartcards
 EAPI=7
 HOMEPAGE=http://pannetrat.com/Cardpeek
-IUSE=libressl
+IUSE=libressl +lua_single_target_lua5-2
 LICENSE=GPL-3
-RDEPEND=sys-apps/pcsc-lite dev-lang/lua:5.2 x11-libs/gtk+:3 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+RDEPEND=lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) sys-apps/pcsc-lite x11-libs/gtk+:3 net-misc/curl !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=^^ ( lua_single_target_lua5-2 )
 SLOT=0
 SRC_URI=http://downloads.pannetrat.com/install/cardpeek-0.8.4.tar.gz
-_md5_=7c11ef61a745536d6b700343df5f59e7
+_eclasses_=lua-single	d51249bd993b9dda6dde2d2276b8dc90	lua-utils	e46ac6841ad67e06b94d930fc64adf6c	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c525fa6fd2830cc92f3f9f459b62b403
diff --git a/metadata/md5-cache/app-crypt/openpgp-keys-voikko-20201013 b/metadata/md5-cache/app-crypt/openpgp-keys-voikko-20201013
new file mode 100644
index 000000000000..f14ebeb6987b
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/openpgp-keys-voikko-20201013
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used to sign voikko* packages
+EAPI=7
+HOMEPAGE=https://voikko.puimula.org/
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=http://keys.gnupg.net/pks/lookup?op=get&search=0x3D309B604AE3942E -> 4AE3942E.asc.html
+_md5_=d7c190f58a89cb84762820b138b64e7e
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 146f6cbd9b5e..fcb8f90e048c 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/qemu-5.1.0-r1 b/metadata/md5-cache/app-emulation/qemu-5.1.0-r1
index a8c853161d67..dbfaec49eed9 100644
--- a/metadata/md5-cache/app-emulation/qemu-5.1.0-r1
+++ b/metadata/md5-cache/app-emulation/qemu-5.1.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) dev-lang/perl sys-apps/texinfo virtual/pkgconfig doc? ( dev-python/sphinx ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
 DEFINED_PHASES=compile configure info install postinst postrm prepare pretend setup test
-DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( 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 ) io-uring? ( sys-libs/liburing ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) 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[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) 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/libssh-0.8.6 ) 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 ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.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-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.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.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] xkb? ( x11-libs/libxkbcommon[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
+DEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( 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 ) io-uring? ( sys-libs/liburing ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) 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[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) 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/libssh-0.8.6 ) 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 ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.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-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.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.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) dev-libs/libxml2[static-libs(+)] xkb? ( x11-libs/libxkbcommon[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty[static-libs(+)] ) aio? ( dev-libs/libaio[static-libs(+)] ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bzip2? ( app-arch/bzip2[static-libs(+)] ) capstone? ( dev-libs/capstone:= ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) gnutls? ( dev-libs/nettle:=[static-libs(+)] >=net-libs/gnutls-3.0:=[static-libs(+)] ) gtk? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) infiniband? ( sys-fabric/libibumad:=[static-libs(+)] sys-fabric/libibverbs:=[static-libs(+)] sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) io-uring? ( sys-libs/liburing[static-libs(+)] ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) multipath? ( sys-fs/multipath-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0=[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) opengl? ( virtual/opengl media-libs/libepoxy[static-libs(+)] media-libs/mesa[static-libs(+)] media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) slirp? ( net-libs/libslirp[static-libs(+)] ) smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr[static-libs(+)] ) )
 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 io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb zstd 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_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx 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_python3_6 python_targets_python3_7 python_targets_python3_8 +filecaps
+IUSE=accessibility +aio alsa bzip2 capstone +caps +curl debug doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static static-user systemtap test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb zstd 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_avr qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_rx 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_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 +filecaps
 KEYWORDS=amd64 arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 LGPL-2 BSD-2
-RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( 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 ) io-uring? ( sys-libs/liburing ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) 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[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) 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/libssh-0.8.6 ) 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 ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.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-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.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.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) 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 !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) virtfs? ( caps xattr ) vte? ( gtk ) plugins? ( !static !static-user )
+RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses,readline] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses,readline] ) python_targets_python3_9? ( dev-lang/python:3.9[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 xkb? ( 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 ) io-uring? ( sys-libs/liburing ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) multipath? ( sys-fs/multipath-tools ) 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[video] media-libs/libsdl2 ) sdl-image? ( media-libs/sdl2-image ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) slirp? ( net-libs/libslirp ) 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/libssh-0.8.6 ) 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 ) zstd? ( >=app-arch/zstd-1.4.0 ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.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-201905[binary] ~sys-firmware/ipxe-1.0.0_p20190728[binary] ~sys-firmware/seabios-1.12.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.12.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) acct-group/kvm selinux? ( sec-policy/selinux-qemu ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) 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 !jack !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) virtfs? ( caps xattr ) vte? ( gtk ) plugins? ( !static !static-user )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-5.1.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c30e85185c090bb087732d6ca4665529
+_md5_=38da8704c42c325e6a835c5046ce00ff
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 2e746748222a..62d26f597547 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
index 34a2f02cfa4b..5a6cec8b6e89 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
+++ b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
@@ -4,10 +4,10 @@ DEPEND=dev-db/sqlite:3
 DESCRIPTION=Statistical Language Model (SLM) based Chinese input method library
 EAPI=7
 HOMEPAGE=https://github.com/sunpinyin/sunpinyin
-KEYWORDS=~amd64 ppc ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( CDDL LGPL-2.1 )
 RDEPEND=dev-db/sqlite:3
 SLOT=0/3
 SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/f39c195db08661e894017507842991a1ef70bedf.tar.gz -> sunpinyin-2.0.4_pre20200306162733.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f75d5349e9dab8cff1e325aaeb6a52d7
+_md5_=e04d76c5e7701e47a7657b19665389f3
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index f27cb9e30a32..23f464d9c621 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/chkcrontab-1.7-r1 b/metadata/md5-cache/app-misc/chkcrontab-1.7-r1
new file mode 100644
index 000000000000..d577f4e3d6b9
--- /dev/null
+++ b/metadata/md5-cache/app-misc/chkcrontab-1.7-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A tool to detect crontab errors
+EAPI=7
+HOMEPAGE=https://github.com/lyda/chkcrontab
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lyda/chkcrontab/archive/v1.7.tar.gz -> chkcrontab-1.7.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=563c0c81ec460d81fcbcba4a9e08c600
diff --git a/metadata/md5-cache/app-misc/worker-3.8.3-r100 b/metadata/md5-cache/app-misc/worker-3.8.3-r100
new file mode 100644
index 000000000000..f3254c162d98
--- /dev/null
+++ b/metadata/md5-cache/app-misc/worker-3.8.3-r100
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install setup
+DEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) magic? ( sys-apps/file ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
+DESCRIPTION=Worker Filemanager: Amiga Directory Opus 4 clone
+EAPI=7
+HOMEPAGE=http://www.boomerangsworld.de/cms/worker/
+IUSE=avfs debug dbus examples libnotify lua +magic xinerama xft lua_single_target_lua5-1 lua_single_target_lua5-2
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) ) magic? ( sys-apps/file ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) )
+SLOT=0
+SRC_URI=http://www.boomerangsworld.de/cms/worker/downloads/worker-3.8.3.tar.bz2
+_eclasses_=lua-single	d51249bd993b9dda6dde2d2276b8dc90	lua-utils	e46ac6841ad67e06b94d930fc64adf6c	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d6d51a9fea588a82d0292c035b88cc02
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 30b2abc72204..6e185fd491ac 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/libreoffice-voikko-5.0 b/metadata/md5-cache/app-office/libreoffice-voikko-5.0
index 7024ae33d6d6..1e7d75e54581 100644
--- a/metadata/md5-cache/app-office/libreoffice-voikko-5.0
+++ b/metadata/md5-cache/app-office/libreoffice-voikko-5.0
@@ -1,11 +1,14 @@
-DEFINED_PHASES=compile install postinst prerm
+BDEPEND=verify-sig? ( app-crypt/openpgp-keys-voikko ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install postinst prerm unpack
 DEPEND=app-office/libreoffice[odk] dev-libs/voikko-fi
 DESCRIPTION=Free Finnish spell checking and hyphenation for LibreOffice
 EAPI=7
 HOMEPAGE=https://voikko.puimula.org/
+IUSE=verify-sig
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=app-office/libreoffice[odk] dev-libs/voikko-fi dev-libs/libvoikko
 SLOT=0
-SRC_URI=https://www.puimula.org/voikko-sources/libreoffice-voikko/libreoffice-voikko-5.0.tar.gz
-_md5_=517ebb7448d5421c674a80de08e9a1b3
+SRC_URI=https://www.puimula.org/voikko-sources/libreoffice-voikko/libreoffice-voikko-5.0.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/libreoffice-voikko/libreoffice-voikko-5.0.tar.gz.asc )
+_eclasses_=verify-sig	f2f84a35f167f86e5da84a2a2f4f7d65
+_md5_=0413b09524038e295951140115d598a9
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 171f2af60bcc..8d5eb3e1090b 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/gentoolkit-0.5.0-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
similarity index 98%
rename from metadata/md5-cache/app-portage/gentoolkit-0.5.0-r1
rename to metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
index c3ba46cf87ab..6775dc05ec83 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.5.0-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=10fe88d047280b76675fd54101a3d5eb
+_md5_=0bf32a2cfdd5a1dde0341a2fc0751e62
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 3d290cc6c9ac..6ac4faaf5849 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.16 b/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.16
deleted file mode 100644
index 3dd3122fd831..000000000000
--- a/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=media-video/mpv-0.25.0[cli] !luajit? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:2 )
-DESCRIPTION=Bash completion for the mpv video player
-EAPI=6
-HOMEPAGE=https://2ion.github.io/mpv-bash-completion/
-IUSE=luajit
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=media-video/mpv-0.25.0[cli] >=app-shells/bash-completion-2.3-r1
-SLOT=0
-SRC_URI=https://github.com/2ion/mpv-bash-completion/archive/3.3.16.tar.gz -> mpv-bash-completion-3.3.16.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=612158b1f6f94a9408e44fb2cf1b95ac
diff --git a/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.17 b/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.17
deleted file mode 100644
index 5e1bf9deda52..000000000000
--- a/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=media-video/mpv-0.25.0[cli] !luajit? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:2 )
-DESCRIPTION=Bash completion for the mpv video player
-EAPI=6
-HOMEPAGE=https://2ion.github.io/mpv-bash-completion/
-IUSE=luajit
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=media-video/mpv-0.25.0[cli] >=app-shells/bash-completion-2.3-r1
-SLOT=0
-SRC_URI=https://github.com/2ion/mpv-bash-completion/archive/3.3.17.tar.gz -> mpv-bash-completion-3.3.17.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=612158b1f6f94a9408e44fb2cf1b95ac
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 6b8db54f3a14..9d67d1baf82f 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/dos2unix-7.4.2_beta1 b/metadata/md5-cache/app-text/dos2unix-7.4.2
similarity index 64%
rename from metadata/md5-cache/app-text/dos2unix-7.4.2_beta1
rename to metadata/md5-cache/app-text/dos2unix-7.4.2
index 46ffaa647a31..5b9a54347606 100644
--- a/metadata/md5-cache/app-text/dos2unix-7.4.2_beta1
+++ b/metadata/md5-cache/app-text/dos2unix-7.4.2
@@ -5,10 +5,11 @@ DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
 EAPI=7
 HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
 IUSE=debug nls test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 RDEPEND=!app-text/hd2u virtual/libintl
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.4.2-beta1.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.4.2-beta1.tar.gz
+SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.4.2.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.4.2.tar.gz
 _eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c8b68ebf06bbfecc5fbb18ada3a7c4b1
+_md5_=044695d6892e2fd08eb398f94909adf3
diff --git a/metadata/md5-cache/app-text/mupdf-1.16.1 b/metadata/md5-cache/app-text/mupdf-1.16.1
index 04d38166ef66..fd56f377a6b6 100644
--- a/metadata/md5-cache/app-text/mupdf-1.16.1
+++ b/metadata/md5-cache/app-text/mupdf-1.16.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare
 DEPEND=media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?,truetype] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] virtual/jpeg[static-libs?] opengl? ( >=media-libs/freeglut-3.0.0:= ) ssl? ( libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] ) !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) ) X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
+DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
 EAPI=7
 HOMEPAGE=https://mupdf.com/
 IUSE=X +javascript libressl opengl ssl static-libs
@@ -11,4 +11,4 @@ REQUIRED_USE=opengl? ( !static-libs )
 SLOT=0/1.16.1
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.16.1-source.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb208646ab3869d9e9e31035b8a2b2ff
+_md5_=a31e05fe58f3f8b23d160ab7e8f0fa2c
diff --git a/metadata/md5-cache/app-text/mupdf-1.17.0 b/metadata/md5-cache/app-text/mupdf-1.17.0
index f3c54e4634f6..1a63c65bcca7 100644
--- a/metadata/md5-cache/app-text/mupdf-1.17.0
+++ b/metadata/md5-cache/app-text/mupdf-1.17.0
@@ -1,7 +1,7 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst postrm preinst prepare
 DEPEND=>=dev-lang/mujs-1.0.7:=[static-libs?] media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?,truetype] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] virtual/jpeg[static-libs?] opengl? ( >=media-libs/freeglut-3.0.0:= ) ssl? ( libressl? ( >=dev-libs/libressl-3.2.0:0=[static-libs?] ) !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) ) X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
+DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
 EAPI=7
 HOMEPAGE=https://mupdf.com/
 IUSE=X +javascript libressl opengl ssl static-libs
@@ -12,4 +12,4 @@ REQUIRED_USE=opengl? ( !static-libs )
 SLOT=0/1.17.0
 SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.17.0-source.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=242b78541a3e7b6f918b2bda7645594c
+_md5_=0b333d5bbc140e8e0ee21cd0507b4aa4
diff --git a/metadata/md5-cache/app-text/mupdf-1.18.0 b/metadata/md5-cache/app-text/mupdf-1.18.0
new file mode 100644
index 000000000000..05b56142afa9
--- /dev/null
+++ b/metadata/md5-cache/app-text/mupdf-1.18.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=>=dev-lang/mujs-1.0.7:=[static-libs?] dev-libs/gumbo media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?,truetype] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] virtual/jpeg[static-libs?] opengl? ( >=media-libs/freeglut-3.0.0:= ) ssl? ( libressl? ( >=dev-libs/libressl-3.2.0:0=[static-libs?] ) !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) ) X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A lightweight PDF viewer and toolkit written in portable C
+EAPI=7
+HOMEPAGE=https://mupdf.com/
+IUSE=X +javascript libressl opengl ssl static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=>=dev-lang/mujs-1.0.7:=[static-libs?] dev-libs/gumbo media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?,truetype] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] virtual/jpeg[static-libs?] opengl? ( >=media-libs/freeglut-3.0.0:= ) ssl? ( libressl? ( >=dev-libs/libressl-3.2.0:0=[static-libs?] ) !libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] ) ) X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] )
+REQUIRED_USE=opengl? ( !static-libs )
+SLOT=0/1.18.0
+SRC_URI=https://mupdf.com/downloads/archive/mupdf-1.18.0-source.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=432bd2bc3ecaac90fbc7a3cf113b38d0
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index f9632453d788..01831ac0f73e 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/platformio-4.3.4 b/metadata/md5-cache/dev-embedded/platformio-4.3.4
deleted file mode 100644
index f63cd28ebc8d..000000000000
--- a/metadata/md5-cache/dev-embedded/platformio-4.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] )
-DESCRIPTION=An open source ecosystem for IoT development
-EAPI=7
-HOMEPAGE=https://platformio.org/
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_6? ( <dev-python/bottle-0.13[python_targets_python3_6(-)] >=dev-python/click-5[python_targets_python3_6(-)] <dev-python/click-8[python_targets_python3_6(-)] dev-python/colorama[python_targets_python3_6(-)] >=dev-python/pyserial-3[python_targets_python3_6(-)] <dev-python/pyserial-4[python_targets_python3_6(-)] >=dev-python/requests-2.4[python_targets_python3_6(-)] <dev-python/requests-3[python_targets_python3_6(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_6(-)] <dev-python/semantic_version-3[python_targets_python3_6(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_6(-)] <dev-python/tabulate-1[python_targets_python3_6(-)] >=dev-python/pyelftools-0.25[python_targets_python3_6(-)] <dev-python/pyelftools-1[python_targets_python3_6(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_6(-)] ) python_single_target_python3_7? ( <dev-python/bottle-0.13[python_targets_python3_7(-)] >=dev-python/click-5[python_targets_python3_7(-)] <dev-python/click-8[python_targets_python3_7(-)] dev-python/colorama[python_targets_python3_7(-)] >=dev-python/pyserial-3[python_targets_python3_7(-)] <dev-python/pyserial-4[python_targets_python3_7(-)] >=dev-python/requests-2.4[python_targets_python3_7(-)] <dev-python/requests-3[python_targets_python3_7(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_7(-)] <dev-python/semantic_version-3[python_targets_python3_7(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_7(-)] <dev-python/tabulate-1[python_targets_python3_7(-)] >=dev-python/pyelftools-0.25[python_targets_python3_7(-)] <dev-python/pyelftools-1[python_targets_python3_7(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_7(-)] ) python_single_target_python3_8? ( <dev-python/bottle-0.13[python_targets_python3_8(-)] >=dev-python/click-5[python_targets_python3_8(-)] <dev-python/click-8[python_targets_python3_8(-)] dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pyserial-3[python_targets_python3_8(-)] <dev-python/pyserial-4[python_targets_python3_8(-)] >=dev-python/requests-2.4[python_targets_python3_8(-)] <dev-python/requests-3[python_targets_python3_8(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_8(-)] <dev-python/semantic_version-3[python_targets_python3_8(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_8(-)] <dev-python/tabulate-1[python_targets_python3_8(-)] >=dev-python/pyelftools-0.25[python_targets_python3_8(-)] <dev-python/pyelftools-1[python_targets_python3_8(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/p/platformio/platformio-4.3.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a5e3822c45021ae93b83e452625d4f8d
diff --git a/metadata/md5-cache/dev-embedded/platformio-5.0.1 b/metadata/md5-cache/dev-embedded/platformio-5.0.1
new file mode 100644
index 000000000000..c34ff8248215
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/platformio-5.0.1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] )
+DESCRIPTION=An open source ecosystem for IoT development
+EAPI=7
+HOMEPAGE=https://platformio.org/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_6? ( <dev-python/bottle-0.13[python_targets_python3_6(-)] >=dev-python/click-5[python_targets_python3_6(-)] <dev-python/click-8[python_targets_python3_6(-)] dev-python/colorama[python_targets_python3_6(-)] >=dev-python/pyserial-3[python_targets_python3_6(-)] <dev-python/pyserial-4[python_targets_python3_6(-)] >=dev-python/requests-2.4[python_targets_python3_6(-)] <dev-python/requests-3[python_targets_python3_6(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_6(-)] <dev-python/semantic_version-3[python_targets_python3_6(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_6(-)] <dev-python/tabulate-1[python_targets_python3_6(-)] >=dev-python/pyelftools-0.25[python_targets_python3_6(-)] <dev-python/pyelftools-1[python_targets_python3_6(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_6(-)] ) python_single_target_python3_7? ( <dev-python/bottle-0.13[python_targets_python3_7(-)] >=dev-python/click-5[python_targets_python3_7(-)] <dev-python/click-8[python_targets_python3_7(-)] dev-python/colorama[python_targets_python3_7(-)] >=dev-python/pyserial-3[python_targets_python3_7(-)] <dev-python/pyserial-4[python_targets_python3_7(-)] >=dev-python/requests-2.4[python_targets_python3_7(-)] <dev-python/requests-3[python_targets_python3_7(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_7(-)] <dev-python/semantic_version-3[python_targets_python3_7(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_7(-)] <dev-python/tabulate-1[python_targets_python3_7(-)] >=dev-python/pyelftools-0.25[python_targets_python3_7(-)] <dev-python/pyelftools-1[python_targets_python3_7(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_7(-)] ) python_single_target_python3_8? ( <dev-python/bottle-0.13[python_targets_python3_8(-)] >=dev-python/click-5[python_targets_python3_8(-)] <dev-python/click-8[python_targets_python3_8(-)] dev-python/colorama[python_targets_python3_8(-)] >=dev-python/pyserial-3[python_targets_python3_8(-)] <dev-python/pyserial-4[python_targets_python3_8(-)] >=dev-python/requests-2.4[python_targets_python3_8(-)] <dev-python/requests-3[python_targets_python3_8(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_8(-)] <dev-python/semantic_version-3[python_targets_python3_8(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_8(-)] <dev-python/tabulate-1[python_targets_python3_8(-)] >=dev-python/pyelftools-0.25[python_targets_python3_8(-)] <dev-python/pyelftools-1[python_targets_python3_8(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( <dev-python/bottle-0.13[python_targets_python3_9(-)] >=dev-python/click-5[python_targets_python3_9(-)] <dev-python/click-8[python_targets_python3_9(-)] dev-python/colorama[python_targets_python3_9(-)] >=dev-python/pyserial-3[python_targets_python3_9(-)] <dev-python/pyserial-4[python_targets_python3_9(-)] >=dev-python/requests-2.4[python_targets_python3_9(-)] <dev-python/requests-3[python_targets_python3_9(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_9(-)] <dev-python/semantic_version-3[python_targets_python3_9(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_9(-)] <dev-python/tabulate-1[python_targets_python3_9(-)] >=dev-python/pyelftools-0.25[python_targets_python3_9(-)] <dev-python/pyelftools-1[python_targets_python3_9(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/platformio/platformio-5.0.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a8392e01f930ee4c6d9a71ffcd7c2b16
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index 7465b9ed6df4..097420217e72 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/epam-1.0.2 b/metadata/md5-cache/dev-erlang/epam-1.0.2
deleted file mode 100644
index 081efebd63ce..000000000000
--- a/metadata/md5-cache/dev-erlang/epam-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=epam for ejabberd to help with PAM authentication support
-EAPI=6
-HOMEPAGE=https://github.com/processone/epam
-KEYWORDS=amd64 ~arm ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/epam/archive/1.0.2.tar.gz -> epam-1.0.2.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=67c98830a3c250a76e3f852c761ce5b7
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.6 b/metadata/md5-cache/dev-erlang/epam-1.0.6
deleted file mode 100644
index fe8b6f0a2eee..000000000000
--- a/metadata/md5-cache/dev-erlang/epam-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=epam for ejabberd to help with PAM authentication support
-EAPI=6
-HOMEPAGE=https://github.com/processone/epam
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/epam/archive/1.0.6.tar.gz -> epam-1.0.6.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=184c4c56fa6cfb6280c6be06908847c1
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.7 b/metadata/md5-cache/dev-erlang/epam-1.0.9
similarity index 87%
rename from metadata/md5-cache/dev-erlang/epam-1.0.7
rename to metadata/md5-cache/dev-erlang/epam-1.0.9
index dcf93b693f22..d37761be83de 100644
--- a/metadata/md5-cache/dev-erlang/epam-1.0.7
+++ b/metadata/md5-cache/dev-erlang/epam-1.0.9
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang:=
 SLOT=0
-SRC_URI=https://github.com/processone/epam/archive/1.0.7.tar.gz -> epam-1.0.7.tar.gz
+SRC_URI=https://github.com/processone/epam/archive/1.0.9.tar.gz -> epam-1.0.9.tar.gz
 _eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0dbf8e67e261f38ab0983242f4c764d2
diff --git a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.11 b/metadata/md5-cache/dev-erlang/eredis-1.2.0
similarity index 55%
rename from metadata/md5-cache/dev-erlang/p1_mysql-1.0.11
rename to metadata/md5-cache/dev-erlang/eredis-1.2.0
index aed2a47f1078..42aabf0bbb2f 100644
--- a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.11
+++ b/metadata/md5-cache/dev-erlang/eredis-1.2.0
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile install prepare test
 DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Pure Erlang MySQL driver
+DESCRIPTION=Erlang Redis client
 EAPI=6
-HOMEPAGE=https://github.com/processone/p1_mysql
+HOMEPAGE=https://github.com/wooga/eredis
 KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=BSD
+LICENSE=MIT
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
+RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/processone/p1_mysql/archive/1.0.11.tar.gz -> p1_mysql-1.0.11.tar.gz
+SRC_URI=https://github.com/wooga/eredis/archive/v1.2.0.tar.gz -> eredis-1.2.0.tar.gz
 _eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=ba75164c7a488069f100ba36d8cda2ba
+_md5_=ecdf5423804b3cecff980d3117b34dce
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.37 b/metadata/md5-cache/dev-erlang/esip-1.0.37
new file mode 100644
index 000000000000..695bf576789e
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/esip-1.0.37
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/fast_tls-1.1.8 >=dev-erlang/stun-1.0.37 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=ProcessOne SIP server component
+EAPI=6
+HOMEPAGE=https://github.com/processone/esip
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/fast_tls-1.1.8 >=dev-erlang/stun-1.0.37 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/esip/archive/1.0.37.tar.gz -> esip-1.0.37.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=0a0d5ea5ef77bd4b9a19642ac0c379d9
diff --git a/metadata/md5-cache/dev-erlang/ezlib-1.0.2 b/metadata/md5-cache/dev-erlang/ezlib-1.0.2
deleted file mode 100644
index 0ab819dbd319..000000000000
--- a/metadata/md5-cache/dev-erlang/ezlib-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1:= sys-libs/zlib dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Native zlib driver for Erlang and Elixir
-EAPI=6
-HOMEPAGE=https://github.com/processone/ezlib
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1:= sys-libs/zlib dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/ezlib/archive/1.0.2.tar.gz -> ezlib-1.0.2.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=8ffee83fe7cf2462166b76003cd3d0ea
diff --git a/metadata/md5-cache/dev-erlang/ezlib-1.0.6 b/metadata/md5-cache/dev-erlang/ezlib-1.0.8
similarity index 77%
rename from metadata/md5-cache/dev-erlang/ezlib-1.0.6
rename to metadata/md5-cache/dev-erlang/ezlib-1.0.8
index a2021641202a..df910643edee 100644
--- a/metadata/md5-cache/dev-erlang/ezlib-1.0.6
+++ b/metadata/md5-cache/dev-erlang/ezlib-1.0.8
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/erlang-17.1:= sys-libs/zlib dev-lang/erlang:=
 SLOT=0
-SRC_URI=https://github.com/processone/ezlib/archive/1.0.6.tar.gz -> ezlib-1.0.6.tar.gz
+SRC_URI=https://github.com/processone/ezlib/archive/1.0.8.tar.gz -> ezlib-1.0.8.tar.gz
 _eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=978e165fb57b243aa4c561dc4c9f1a08
+_md5_=a8cc69ff19d3d2404756c578f0523a5e
diff --git a/metadata/md5-cache/dev-erlang/mqtree-1.0.10 b/metadata/md5-cache/dev-erlang/mqtree-1.0.10
new file mode 100644
index 000000000000..b5b16ee54f56
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/mqtree-1.0.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Index tree for MQTT topic filters
+EAPI=6
+HOMEPAGE=https://github.com/processone/mqtree
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/mqtree/archive/1.0.10.tar.gz -> mqtree-1.0.10.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=89291b2201a2cb8f2e2b07b58f8027b6
diff --git a/metadata/md5-cache/dev-erlang/mqtree-1.0.4 b/metadata/md5-cache/dev-erlang/mqtree-1.0.4
deleted file mode 100644
index 65c6b4852aa8..000000000000
--- a/metadata/md5-cache/dev-erlang/mqtree-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.16 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Index tree for MQTT topic filters
-EAPI=6
-HOMEPAGE=https://github.com/processone/mqtree
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.16 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/mqtree/archive/1.0.4.tar.gz -> mqtree-1.0.4.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=5be8429d9a608316b6f0d3ca594e4ef5
diff --git a/metadata/md5-cache/dev-erlang/mqtree-1.0.5 b/metadata/md5-cache/dev-erlang/mqtree-1.0.5
deleted file mode 100644
index 212c2a190f69..000000000000
--- a/metadata/md5-cache/dev-erlang/mqtree-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.16 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Index tree for MQTT topic filters
-EAPI=6
-HOMEPAGE=https://github.com/processone/mqtree
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.16 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/mqtree/archive/1.0.5.tar.gz -> mqtree-1.0.5.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=5be8429d9a608316b6f0d3ca594e4ef5
diff --git a/metadata/md5-cache/dev-erlang/p1_acme-1.0.8 b/metadata/md5-cache/dev-erlang/p1_acme-1.0.8
new file mode 100644
index 000000000000..32dbb33a121c
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/p1_acme-1.0.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/yconf-1.0.7 >=dev-erlang/idna-6.0.0 >=dev-erlang/jose-1.9.0 >=dev-erlang/base64url-1.0 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=ACME client library for Erlang
+EAPI=6
+HOMEPAGE=https://github.com/processone/p1_acme
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/yconf-1.0.7 >=dev-erlang/idna-6.0.0 >=dev-erlang/jose-1.9.0 >=dev-erlang/base64url-1.0 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/p1_acme/archive/1.0.8.tar.gz -> p1_acme-1.0.8.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=a975f89d5ed5376d359d83cb8f3271a4
diff --git a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.14 b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.16
similarity index 81%
rename from metadata/md5-cache/dev-erlang/p1_mysql-1.0.14
rename to metadata/md5-cache/dev-erlang/p1_mysql-1.0.16
index be8a77c25a3a..4f0fdd9541da 100644
--- a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.14
+++ b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.16
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
 SLOT=0
-SRC_URI=https://github.com/processone/p1_mysql/archive/1.0.14.tar.gz -> p1_mysql-1.0.14.tar.gz
+SRC_URI=https://github.com/processone/p1_mysql/archive/1.0.16.tar.gz -> p1_mysql-1.0.16.tar.gz
 _eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
 _md5_=b1e29176c12dd065f49272ae3b5a74ec
diff --git a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.2 b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.2
deleted file mode 100644
index 562f1c9086c0..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Pure Erlang MySQL driver
-EAPI=6
-HOMEPAGE=https://github.com/processone/p1_mysql
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/p1_mysql/archive/1.0.2.tar.gz -> p1_mysql-1.0.2.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=d55cb31e15d129cdcbb39b9998b9bdca
diff --git a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.1 b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.1
deleted file mode 100644
index 97f93f4f8260..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/meck-0.8.3 >=dev-erlang/proper-1.1_p20150814 ) dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Erlang OAuth 2.0 implementation
-EAPI=6
-HOMEPAGE=https://github.com/processone/p1_oauth2
-IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/processone/p1_oauth2/archive/0.6.1.tar.gz -> p1_oauth2-0.6.1.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=803a5ab40a890f69c15364eabeb092ec
diff --git a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.5 b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.7
similarity index 78%
rename from metadata/md5-cache/dev-erlang/p1_oauth2-0.6.5
rename to metadata/md5-cache/dev-erlang/p1_oauth2-0.6.7
index ed753fb0f045..3216a6876192 100644
--- a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.5
+++ b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.7
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/processone/p1_oauth2/archive/0.6.5.tar.gz -> p1_oauth2-0.6.5.tar.gz
+SRC_URI=https://github.com/processone/p1_oauth2/archive/0.6.7.tar.gz -> p1_oauth2-0.6.7.tar.gz
 _eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=be1db729652ebaa8ef9c099e7a1b5ba5
+_md5_=fa81384c4b75ce77407d4c7847eaccf7
diff --git a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.8 b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.10
similarity index 74%
rename from metadata/md5-cache/dev-erlang/p1_pgsql-1.1.8
rename to metadata/md5-cache/dev-erlang/p1_pgsql-1.1.10
index 5145629df0bc..f32259439c70 100644
--- a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.8
+++ b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.10
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
 SLOT=0
-SRC_URI=https://github.com/processone/p1_pgsql/archive/1.1.8.tar.gz -> p1_pgsql-1.1.8.tar.gz
+SRC_URI=https://github.com/processone/p1_pgsql/archive/1.1.10.tar.gz -> p1_pgsql-1.1.10.tar.gz
 _eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=7b5e3344e542a3c3005fd06319a8b4ed
+_md5_=6944376dd23c8454492ea546a5126849
diff --git a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.2 b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.2
deleted file mode 100644
index 7e24795a119e..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Pure Erlang PostgreSQL driver
-EAPI=6
-HOMEPAGE=https://github.com/processone/p1_pgsql
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=ErlPL-1.1
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/p1_pgsql/archive/1.1.2.tar.gz -> p1_pgsql-1.1.2.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=2185e036ed18b7e13418ebfd0df3d44b
diff --git a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.6 b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.6
deleted file mode 100644
index 8c83196be6e0..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=Pure Erlang PostgreSQL driver
-EAPI=6
-HOMEPAGE=https://github.com/processone/p1_pgsql
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=ErlPL-1.1
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/p1_pgsql/archive/1.1.6.tar.gz -> p1_pgsql-1.1.6.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=a818ceb54394ebd7ee46434cf749dd2b
diff --git a/metadata/md5-cache/dev-erlang/pkix-1.0.3 b/metadata/md5-cache/dev-erlang/pkix-1.0.3
deleted file mode 100644
index 60477327e703..000000000000
--- a/metadata/md5-cache/dev-erlang/pkix-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.5 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=PKIX certificates management library for Erlang
-EAPI=6
-HOMEPAGE=https://github.com/processone/pkix
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.5 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/pkix/archive/1.0.3.tar.gz -> pkix-1.0.3.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=826dd68a90f63dd3a58026dc5c628d4f
diff --git a/metadata/md5-cache/dev-erlang/pkix-1.0.4 b/metadata/md5-cache/dev-erlang/pkix-1.0.4
deleted file mode 100644
index 22469ec216c6..000000000000
--- a/metadata/md5-cache/dev-erlang/pkix-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.5 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=PKIX certificates management library for Erlang
-EAPI=6
-HOMEPAGE=https://github.com/processone/pkix
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.5 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/pkix/archive/1.0.4.tar.gz -> pkix-1.0.4.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=826dd68a90f63dd3a58026dc5c628d4f
diff --git a/metadata/md5-cache/dev-erlang/pkix-1.0.6 b/metadata/md5-cache/dev-erlang/pkix-1.0.6
new file mode 100644
index 000000000000..d07403e0f6ed
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/pkix-1.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=PKIX certificates management library for Erlang
+EAPI=6
+HOMEPAGE=https://github.com/processone/pkix
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/pkix/archive/1.0.6.tar.gz -> pkix-1.0.6.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=7ca0fcd5a9c451d6fa6b282536d41371
diff --git a/metadata/md5-cache/dev-erlang/sqlite3-1.1.6 b/metadata/md5-cache/dev-erlang/sqlite3-1.1.6
deleted file mode 100644
index 38ba93940f76..000000000000
--- a/metadata/md5-cache/dev-erlang/sqlite3-1.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
-DESCRIPTION=SQLite gen_server port for Erlang
-EAPI=6
-HOMEPAGE=https://github.com/processone/erlang-sqlite3
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
-LICENSE=ErlPL-1.1
-RDEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/erlang-sqlite3/archive/1.1.6.tar.gz -> sqlite3-1.1.6.tar.gz
-_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=0c8e6d411edd333d8a3bc3923a58a777
diff --git a/metadata/md5-cache/dev-erlang/sqlite3-1.1.5 b/metadata/md5-cache/dev-erlang/sqlite3-1.1.8
similarity index 79%
rename from metadata/md5-cache/dev-erlang/sqlite3-1.1.5
rename to metadata/md5-cache/dev-erlang/sqlite3-1.1.8
index 2d1255da3a2c..d3df1acce3df 100644
--- a/metadata/md5-cache/dev-erlang/sqlite3-1.1.5
+++ b/metadata/md5-cache/dev-erlang/sqlite3-1.1.8
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang:= dev-util/rebar >
 DESCRIPTION=SQLite gen_server port for Erlang
 EAPI=6
 HOMEPAGE=https://github.com/processone/erlang-sqlite3
-KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=ErlPL-1.1
 RDEPEND=>=dev-lang/erlang-17.1 dev-db/sqlite:3 dev-lang/erlang:=
 SLOT=0
-SRC_URI=https://github.com/processone/erlang-sqlite3/archive/1.1.5.tar.gz -> sqlite3-1.1.5.tar.gz
+SRC_URI=https://github.com/processone/erlang-sqlite3/archive/1.1.8.tar.gz -> sqlite3-1.1.8.tar.gz
 _eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
-_md5_=26537554e1075cf4b54e0895f4870e46
+_md5_=f110e620311d11c9cc1709dbf9632c14
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.22 b/metadata/md5-cache/dev-erlang/stringprep-1.0.22
new file mode 100644
index 000000000000..1840a4f0fbe5
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/stringprep-1.0.22
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/stringprep
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 tcltk
+RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/stringprep/archive/1.0.22.tar.gz -> stringprep-1.0.22.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=649da3c465f4649c840ad8b3a16b66ad
diff --git a/metadata/md5-cache/dev-erlang/stun-1.0.38 b/metadata/md5-cache/dev-erlang/stun-1.0.38
new file mode 100644
index 000000000000..e87742cd433c
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/stun-1.0.38
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/fast_tls-1.1.8 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=STUN and TURN library for Erlang and Elixir
+EAPI=6
+HOMEPAGE=https://github.com/processone/stun
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-erlang/fast_tls-1.1.8 >=dev-erlang/p1_utils-1.0.20 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/stun/archive/1.0.38.tar.gz -> stun-1.0.38.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=fb61d27b86f121d080cf39113add3d17
diff --git a/metadata/md5-cache/dev-erlang/xmpp-1.4.9 b/metadata/md5-cache/dev-erlang/xmpp-1.4.9
new file mode 100644
index 000000000000..36178e7ccc57
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/xmpp-1.4.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/ezlib-1.0.8 >=dev-erlang/fast_tls-1.1.8 >=dev-erlang/fast_xml-1.1.43 >=dev-erlang/p1_utils-1.0.20 >=dev-erlang/stringprep-1.0.22 >=dev-erlang/idna-6.0.0 dev-lang/erlang:= dev-util/rebar >=sys-apps/gawk-4.1
+DESCRIPTION=XMPP parsing and serialization library on top of Fast XML
+EAPI=6
+HOMEPAGE=https://github.com/processone/xmpp
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/ezlib-1.0.8 >=dev-erlang/fast_tls-1.1.8 >=dev-erlang/fast_xml-1.1.43 >=dev-erlang/p1_utils-1.0.20 >=dev-erlang/stringprep-1.0.22 >=dev-erlang/idna-6.0.0 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/xmpp/archive/1.4.9.tar.gz -> xmpp-1.4.9.tar.gz
+_eclasses_=rebar	43c151aeda0dc4bf44b59e949df136aa
+_md5_=1af246564fc599af1e67c9ad0f78c133
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index a6b7c4e0b81d..05587e0013e4 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/mujs-1.0.9 b/metadata/md5-cache/dev-lang/mujs-1.0.9
new file mode 100644
index 000000000000..ec56f271cf27
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/readline:0=
+DESCRIPTION=An embeddable Javascript interpreter in C.
+EAPI=7
+HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=ISC
+RDEPEND=sys-libs/readline:0=
+SLOT=0/1.0.9
+SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.9.tar.gz -> mujs-1.0.9.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e288c720712f678a518e70281f0ec661
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.10.0 b/metadata/md5-cache/dev-lang/ocaml-4.10.0
new file mode 100644
index 000000000000..eda1d6f3730a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ocaml-4.10.0
@@ -0,0 +1,13 @@
+BDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Programming language supporting functional, imperative & object-oriented styles
+EAPI=7
+HOMEPAGE=https://ocaml.org/
+IUSE=emacs flambda latex +ocamlopt spacetime xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
+RDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= )
+SLOT=0/4.10.0
+SRC_URI=https://github.com/ocaml/ocaml/archive/4.10.0.tar.gz -> ocaml-4.10.0.tar.gz
+_md5_=b2feeee919c47641dd4130f6d3198d29
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.11.1 b/metadata/md5-cache/dev-lang/ocaml-4.11.1
new file mode 100644
index 000000000000..9f4e9eaae55a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ocaml-4.11.1
@@ -0,0 +1,13 @@
+BDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Programming language supporting functional, imperative & object-oriented styles
+EAPI=7
+HOMEPAGE=https://ocaml.org/
+IUSE=emacs flambda latex +ocamlopt spacetime xemacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=QPL-1.0 LGPL-2
+PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
+RDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= )
+SLOT=0/4.11.1
+SRC_URI=https://github.com/ocaml/ocaml/archive/4.11.1.tar.gz -> ocaml-4.11.1.tar.gz
+_md5_=eaeaeb647cab112d23633007a271f9c4
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.47.0-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.47.0-r1
index 516dc54c2916..b1aa3441e37e 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.47.0-r1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.47.0-r1
@@ -10,4 +10,4 @@ REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.47.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.47.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.47.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.47.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.47.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.47.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.47.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.47.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.47.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.47.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.47.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.47.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.47.0-s390x-unknown-linux-gnu.tar.xz ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.47.0-i686-unknown-linux-gnu.tar.xz )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d48d556f80dd5c319bbd27bde1c33b54
+_md5_=2e0b3751a930086d45e0633cfd7bdb88
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index e54ad876b035..8c6c888f01c2 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/botan-2.14.0-r1 b/metadata/md5-cache/dev-libs/botan-2.14.0-r1
deleted file mode 100644
index 264369aa0080..000000000000
--- a/metadata/md5-cache/dev-libs/botan-2.14.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/python:* doc? ( dev-python/sphinx )
-DEFINED_PHASES=configure install test
-DEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=C++ crypto library
-EAPI=7
-HOMEPAGE=https://botan.randombit.net/
-IUSE=bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos
-LICENSE=BSD
-RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) boost? ( >=dev-libs/boost-1.48:= ) bzip2? ( >=app-arch/bzip2-1.0.5:= ) lzma? ( app-arch/xz-utils:= ) sqlite? ( dev-db/sqlite:3= ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.3:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
-SLOT=2/2.14
-SRC_URI=https://botan.randombit.net/releases/Botan-2.14.0.tar.xz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f2b011c1faf3a222717a7f9b44eae5cb
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.181 b/metadata/md5-cache/dev-libs/elfutils-0.181
index fa69be7d600d..e0cb8a57b1fc 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.181
+++ b/metadata/md5-cache/dev-libs/elfutils-0.181
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for l
 EAPI=7
 HOMEPAGE=http://elfutils.org/
 IUSE=bzip2 lzma nls static-libs test +threads +utils valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-libs/libelf
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.181/elfutils-0.181.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=04aa73ea585f79e3485e90c42eb31b82
+_md5_=be3a72e6c2393b7401efbdb268c4b522
diff --git a/metadata/md5-cache/dev-libs/injeqt-1.2.0 b/metadata/md5-cache/dev-libs/injeqt-1.2.0
index 73000b50704e..61813e1705a9 100644
--- a/metadata/md5-cache/dev-libs/injeqt-1.2.0
+++ b/metadata/md5-cache/dev-libs/injeqt-1.2.0
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vogel/injeqt/archive/1.2.0.tar.gz -> injeqt-1.2.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3efdcbba619deed1de8fd47edf5be248
+_md5_=1c8054126bd9fdd15b4e97048fad2514
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.12 b/metadata/md5-cache/dev-libs/libdnet-1.12
deleted file mode 100644
index d6e853317b66..000000000000
--- a/metadata/md5-cache/dev-libs/libdnet-1.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=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_python2_7(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=simplified, portable interface to several low-level networking routines
-EAPI=5
-HOMEPAGE=https://github.com/dugsong/libdnet
-IUSE=ipv6 python static-libs test python_targets_python2_7
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2
-RDEPEND=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_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://libdnet.googlecode.com/files/libdnet-1.12.tgz ipv6? ( https://fragroute-ipv6.googlecode.com/files/libdnet-1.12.ipv6-1.patch.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=256d4006378849204811234249f8e3cd
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.12-r1 b/metadata/md5-cache/dev-libs/libdnet-1.12-r1
deleted file mode 100644
index 697306a89dd9..000000000000
--- a/metadata/md5-cache/dev-libs/libdnet-1.12-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=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_python2_7(-)] )
-DESCRIPTION=simplified, portable interface to several low-level networking routines
-EAPI=7
-HOMEPAGE=https://github.com/dugsong/libdnet
-IUSE=ipv6 python static-libs test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=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_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/dugsong/libdnet/archive/libdnet-1.12.tar.gz ipv6? ( https://fragroute-ipv6.googlecode.com/files/libdnet-1.12.ipv6-1.patch.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1145f6c9d35e25e74a662921d3555329
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14 b/metadata/md5-cache/dev-libs/libdnet-1.14
deleted file mode 100644
index 545b61f82ea3..000000000000
--- a/metadata/md5-cache/dev-libs/libdnet-1.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=simplified, portable interface to several low-level networking routines
-EAPI=7
-HOMEPAGE=https://github.com/ofalk/libdnet
-IUSE=python static-libs test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2
-RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ofalk/libdnet/archive/libdnet-1.14.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=658420b13ba20d5cb4bed70bee22c7de
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14-r1 b/metadata/md5-cache/dev-libs/libdnet-1.14-r1
index 749e1be28f1f..9bc67c269d10 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.14-r1
+++ b/metadata/md5-cache/dev-libs/libdnet-1.14-r1
@@ -5,7 +5,7 @@ DESCRIPTION=simplified, portable interface to several low-level networking routi
 EAPI=7
 HOMEPAGE=https://github.com/ofalk/libdnet
 IUSE=python static-libs test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2
 RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ofalk/libdnet/archive/libdnet-1.14.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f13335f56eb49140f47fd0ed065dd16a
+_md5_=23c8fb1aa05457eff9b5ff88066a5cb9
diff --git a/metadata/md5-cache/dev-libs/libvoikko-4.3 b/metadata/md5-cache/dev-libs/libvoikko-4.3
index cc69a6cffb6f..624eb8cdc812 100644
--- a/metadata/md5-cache/dev-libs/libvoikko-4.3
+++ b/metadata/md5-cache/dev-libs/libvoikko-4.3
@@ -1,15 +1,16 @@
-DEFINED_PHASES=configure install
+BDEPEND=verify-sig? ( app-crypt/openpgp-keys-voikko ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install unpack
 DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] hfst? ( >=dev-util/hfstospell-0.5.0 )
 DESCRIPTION=Spell checking, hyphenation and morphological analysis tool for Finnish language
 EAPI=7
 HOMEPAGE=https://voikko.puimula.org/
-IUSE=+expvfst +hfst python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=+expvfst +hfst verify-sig python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 verify-sig
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] hfst? ( >=dev-util/hfstospell-0.5.0 )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fd106a5845a14eff51d19578f3c819de
+SRC_URI=https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.tar.gz.asc )
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	f2f84a35f167f86e5da84a2a2f4f7d65
+_md5_=c2e0c6c3f33b2a8df97deb1f858dfd7c
diff --git a/metadata/md5-cache/dev-libs/libxls-1.6.1 b/metadata/md5-cache/dev-libs/libxls-1.6.1
index 6c4cdefc2529..96ddc4fa39a0 100644
--- a/metadata/md5-cache/dev-libs/libxls-1.6.1
+++ b/metadata/md5-cache/dev-libs/libxls-1.6.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=A library which can read Excel (xls) files
 EAPI=7
 HOMEPAGE=https://github.com/libxls/libxls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RESTRICT=test
 SLOT=0/8
 SRC_URI=https://github.com/libxls/libxls/releases/download/v1.6.1/libxls-1.6.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=13cfa8eee8c1ada07ace996498ad1238
+_md5_=f6a812c8217df96d99051cfbeb28850b
diff --git a/metadata/md5-cache/dev-libs/voikko-fi-2.3 b/metadata/md5-cache/dev-libs/voikko-fi-2.3
index 4f41b42b986f..d21118f3da78 100644
--- a/metadata/md5-cache/dev-libs/voikko-fi-2.3
+++ b/metadata/md5-cache/dev-libs/voikko-fi-2.3
@@ -1,13 +1,14 @@
-BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-libs/libvoikko
-DEFINED_PHASES=compile install setup
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-libs/libvoikko verify-sig? ( app-crypt/openpgp-keys-voikko ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install setup unpack
 DEPEND=dev-libs/foma dev-libs/libvoikko
 DESCRIPTION=Finnish dictionary for libvoikko based spell checkers (vvfst format)
 EAPI=7
 HOMEPAGE=https://voikko.puimula.org/
+IUSE=verify-sig
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/foma dev-libs/libvoikko
 SLOT=0
-SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.3.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=acbe4090ffe3d78bfae7d9c6d869160f
+SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.3.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.3.tar.gz.asc )
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	f2f84a35f167f86e5da84a2a2f4f7d65
+_md5_=afcab0a98cb4afb1169105a7d1cb7452
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index e4dbd000c35f..8a1c42e7232f 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/luv-1.32.0.0-r100 b/metadata/md5-cache/dev-lua/luv-1.32.0.0-r100
new file mode 100644
index 000000000000..600aaeddfa31
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/luv-1.32.0.0-r100
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) >=dev-libs/libuv-1.32.0:=
+DESCRIPTION=Bare libuv bindings for lua
+EAPI=7
+HOMEPAGE=https://github.com/luvit/luv
+IUSE=test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0 MIT
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) >=dev-libs/libuv-1.32.0:=
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/luvit/luv/archive/1.32.0-0.tar.gz -> luv-1.32.0.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.7.tar.gz -> luv-lua-compat-0.7.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	d51249bd993b9dda6dde2d2276b8dc90	lua-utils	e46ac6841ad67e06b94d930fc64adf6c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c9305c6c0e6b158735f2aa3dca96c9a5
diff --git a/metadata/md5-cache/dev-lua/messagepack-0.3.2-r100 b/metadata/md5-cache/dev-lua/messagepack-0.3.2-r100
new file mode 100644
index 000000000000..070f9745497c
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/messagepack-0.3.2-r100
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install test
+DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+DESCRIPTION=A pure Lua implementation of the MessagePack serialization format
+EAPI=7
+HOMEPAGE=http://fperrad.github.io/lua-MessagePack/
+IUSE=lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-2? ( dev-lang/lua:5.2 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 )
+REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/lua-messagepack-0.3.2.tar.xz
+_eclasses_=lua	a0554aeb2bf64fc720676ffaa544130d	lua-utils	e46ac6841ad67e06b94d930fc64adf6c	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5be0e53ea8440a9af1067cc0d58bf7c9
diff --git a/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100 b/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
new file mode 100644
index 000000000000..92f972ec805e
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513-r100
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 )
+DESCRIPTION=A tool to integrate C/C++ code with Lua
+EAPI=7
+HOMEPAGE=https://github.com/LuaDist/toluapp
+IUSE=+lua_single_target_lua5-1
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
+SLOT=0
+SRC_URI=https://github.com/LuaDist/toluapp/archive/b34075b76835b778bb6b2ce0aa224afd9d182887.tar.gz -> toluapp-1.0.93_p20190513.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	d51249bd993b9dda6dde2d2276b8dc90	lua-utils	e46ac6841ad67e06b94d930fc64adf6c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=df57dc7b98d8b3fbe4c7593d2c5c1feb
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 79dea5f5c491..46e0064a5382 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/alcotest-0.8.2 b/metadata/md5-cache/dev-ml/alcotest-0.8.2
index b9618b0d2937..99c51d054b5f 100644
--- a/metadata/md5-cache/dev-ml/alcotest-0.8.2
+++ b/metadata/md5-cache/dev-ml/alcotest-0.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= dev-ml/jbuilder dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= dev-ml/jbuilder dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=A lightweight and colourful test framework
 EAPI=5
 HOMEPAGE=https://github.com/mirage/alcotest/
@@ -10,5 +10,5 @@ RDEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= >=dev-la
 RESTRICT=!test? ( test )
 SLOT=0/0.8.2
 SRC_URI=https://github.com/mirage/alcotest/archive/0.8.2.tar.gz -> alcotest-0.8.2.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=e88ebb65444a1e01d8632ee831408ba1
diff --git a/metadata/md5-cache/dev-ml/astring-0.8.3 b/metadata/md5-cache/dev-ml/astring-0.8.3
index aacffb4f30d7..a44030bb2d41 100644
--- a/metadata/md5-cache/dev-ml/astring-0.8.3
+++ b/metadata/md5-cache/dev-ml/astring-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Alternative String module for OCaml
 EAPI=5
 HOMEPAGE=https://erratique.ch/software/astring https://github.com/dbuenzli/astring
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-lang/ocaml-4:=
 SLOT=0/0.8.3
 SRC_URI=https://erratique.ch/software/astring/releases/astring-0.8.3.tbz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=394c66729d8398c752a2d767955615fb
diff --git a/metadata/md5-cache/dev-ml/async-0.9.0 b/metadata/md5-cache/dev-ml/async-0.9.0
index 264fc8219dd1..6fc33a2adb61 100644
--- a/metadata/md5-cache/dev-ml/async-0.9.0
+++ b/metadata/md5-cache/dev-ml/async-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/async_extra:= dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/async_extra:= dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Jane Street Capital's asynchronous execution library
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/async
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/async_extra:= dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/async/archive/v0.9.0.tar.gz -> async-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=a986994d3355154bf98c7ebfba8f16ed
diff --git a/metadata/md5-cache/dev-ml/base-0.14.0 b/metadata/md5-cache/dev-ml/base-0.14.0
new file mode 100644
index 000000000000..30797c26a7a4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/base-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/sexplib0-0.12:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Standard library for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/base
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/sexplib0-0.12:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/base/archive/v0.14.0.tar.gz -> base-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=aa48a8b3c55425c4392a78e11571289f
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0 b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0
new file mode 100644
index 000000000000..80a0714abf0f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_base:= dev-ml/ppx_fields_conv:= dev-ml/ppx_let:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/splittable_random:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Randomized testing framework, designed for compatibility with Base
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/base_quickcheck
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-ml/base:= dev-ml/ppx_base:= dev-ml/ppx_fields_conv:= dev-ml/ppx_let:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/splittable_random:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.14.0.tar.gz -> base_quickcheck-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=d17bcb10634aaaa30e3bcdd9078e1150
diff --git a/metadata/md5-cache/dev-ml/bin_prot-0.14.0 b/metadata/md5-cache/dev-ml/bin_prot-0.14.0
new file mode 100644
index 000000000000..7c1561783be6
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/bin_prot-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_variants_conv:= !dev-ml/bin-prot >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Binary protocol generator
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/bin_prot
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_fields_conv:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_variants_conv:= !dev-ml/bin-prot >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.14.0.tar.gz -> bin_prot-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=bcaf858bbcadc17498cadc51b3ce8b16
diff --git a/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1 b/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1
new file mode 100644
index 000000000000..b99bb298a9a0
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cairo-ocaml-1.2.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-lang/ocaml:= x11-libs/cairo gtk? ( dev-ml/lablgtk:2= ) pango? ( x11-libs/pango ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Ocaml bindings for the cairo vector graphics library
+EAPI=7
+HOMEPAGE=https://www.cairographics.org/cairo-ocaml/
+IUSE=doc examples gtk pango
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=dev-lang/ocaml:= x11-libs/cairo gtk? ( dev-ml/lablgtk:2= ) pango? ( x11-libs/pango )
+SLOT=0/1.2.0
+SRC_URI=https://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-1.2.0.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	findlib	17c71a5d96323df925f9f6db1215668a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=03d2a65ae09b5132526e5dbed1dd8886
diff --git a/metadata/md5-cache/dev-ml/cairo2-0.6.1 b/metadata/md5-cache/dev-ml/cairo2-0.6.1
new file mode 100644
index 000000000000..bb3b9b9f1935
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cairo2-0.6.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=x11-libs/cairo:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Binding to Cairo, a 2D Vector Graphics Library
+EAPI=7
+HOMEPAGE=https://github.com/Chris00/ocaml-cairo
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=x11-libs/cairo:= dev-ml/dune-configurator:= !dev-ml/ocaml-cairo >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/0.6.1
+SRC_URI=https://github.com/Chris00/ocaml-cairo/releases/download/0.6.1/cairo2-0.6.1.tbz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=adda5ba43170afa3e83dbe1f07d95176
diff --git a/metadata/md5-cache/dev-ml/camlbz2-0.6.0-r1 b/metadata/md5-cache/dev-ml/camlbz2-0.6.0-r1
new file mode 100644
index 000000000000..acb8939e4dff
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/camlbz2-0.6.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=OCaml bindings for libbz (AKA, bzip2)
+EAPI=7
+HOMEPAGE=http://camlbz2.forge.ocamlcore.org/
+IUSE=doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt]
+SLOT=0/0.6.0
+SRC_URI=http://forge.ocamlcore.org/frs/download.php/72/camlbz2-0.6.0.tar.gz
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=f8db52688089e1e937605db9a05084dc
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.04_p1 b/metadata/md5-cache/dev-ml/camlp4-4.04_p1
index ba2700680675..64188a93ba37 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.04_p1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.04_p1
@@ -6,7 +6,7 @@ HOMEPAGE=https://github.com/camlp4/camlp4
 IUSE=+ocamlopt
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2-with-linking-exception
-RDEPEND==dev-lang/ocaml-4.04*:=[ocamlopt?] !<dev-lang/ocaml-4.02 !<dev-ml/findlib-1.5.5-r1
+RDEPEND==dev-lang/ocaml-4.04*:=[ocamlopt?]
 SLOT=0/4.04_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.04+1.tar.gz -> camlp4-4.04_p1.tar.gz
-_md5_=e03c0c9c6757b5b9f623928e4a152ff6
+_md5_=786979907abd54cab444b6268ac77e2c
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.05_p1 b/metadata/md5-cache/dev-ml/camlp4-4.05_p1
index ef5bd029ce76..bbb87214fe6f 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.05_p1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.05_p1
@@ -6,7 +6,7 @@ HOMEPAGE=https://github.com/camlp4/camlp4
 IUSE=+ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2-with-linking-exception
-RDEPEND==dev-lang/ocaml-4.05*:=[ocamlopt?] !<dev-lang/ocaml-4.02 !<dev-ml/findlib-1.5.5-r1
+RDEPEND==dev-lang/ocaml-4.05*:=[ocamlopt?]
 SLOT=0/4.05_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.05+1.tar.gz -> camlp4-4.05_p1.tar.gz
-_md5_=41fa9b087eaec951e6d321f46797b53b
+_md5_=71d1b2aa4c46e6b567eb33acfa3fc579
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.08_p1 b/metadata/md5-cache/dev-ml/camlp4-4.08_p1
index a0481c11d1d5..7ee3e7ab9a88 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.08_p1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.08_p1
@@ -6,7 +6,7 @@ HOMEPAGE=https://github.com/camlp4/camlp4
 IUSE=+ocamlopt
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt?] !<dev-lang/ocaml-4.02 !<dev-ml/findlib-1.5.5-r1
+RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt?]
 SLOT=0/4.08_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.08+1.tar.gz -> camlp4-4.08_p1.tar.gz
-_md5_=5b6097c600f93231448ad2b369515760
+_md5_=b60323c6b7827b5c2e7e5af9b5e27cde
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.10_p1 b/metadata/md5-cache/dev-ml/camlp4-4.10_p1
new file mode 100644
index 000000000000..a9a5e758dbb3
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/camlp4-4.10_p1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-lang/ocaml-4.10.0:=[ocamlopt?] dev-ml/ocamlbuild
+DESCRIPTION=System for writing extensible parsers for programming languages
+EAPI=7
+HOMEPAGE=https://github.com/camlp4/camlp4
+IUSE=+ocamlopt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-4.10.0:=[ocamlopt?]
+SLOT=0/4.10_p1
+SRC_URI=https://github.com/camlp4/camlp4/archive/4.10+1.tar.gz -> camlp4-4.10_p1.tar.gz
+_md5_=4655ec4dbe7fc8dbece18d54ec9fc7a0
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.11_p1 b/metadata/md5-cache/dev-ml/camlp4-4.11_p1
new file mode 100644
index 000000000000..f3fe1b53f8cf
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/camlp4-4.11_p1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-lang/ocaml-4.11.0:=[ocamlopt?] dev-ml/ocamlbuild
+DESCRIPTION=System for writing extensible parsers for programming languages
+EAPI=7
+HOMEPAGE=https://github.com/camlp4/camlp4
+IUSE=+ocamlopt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-4.11.0:=[ocamlopt?]
+SLOT=0/4.11_p1
+SRC_URI=https://github.com/camlp4/camlp4/archive/4.11+1.tar.gz -> camlp4-4.11_p1.tar.gz
+_md5_=df63f0973a04402d78563804e3bb2239
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.12 b/metadata/md5-cache/dev-ml/camlp5-7.12
new file mode 100644
index 000000000000..d782bf991e57
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/camlp5-7.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=A preprocessor-pretty-printer of ocaml
+EAPI=7
+HOMEPAGE=https://camlp5.github.io/
+IUSE=doc +ocamlopt
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
+SLOT=0/7.12
+SRC_URI=https://github.com/camlp5/camlp5/archive/rel712.tar.gz -> camlp5-7.12.tar.gz
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=886be777e0b10cceabba9e82aad3a3c9
diff --git a/metadata/md5-cache/dev-ml/cinaps-0.14.0 b/metadata/md5-cache/dev-ml/cinaps-0.14.0
new file mode 100644
index 000000000000..5c032ad2e08d
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cinaps-0.14.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/re:= test? ( dev-ml/ppx_jane ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Trivial metaprogramming tool
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-ppx/cinaps
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/0.14.0
+SRC_URI=https://github.com/ocaml-ppx/cinaps/archive/v0.14.0.tar.gz -> cinaps-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=c2985d5b68e3b73ef802f7c9eff5980f
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.4 b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
new file mode 100644
index 000000000000..2dfeedc93a6d
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/findlib:= dev-ml/topkg dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Declarative definition of command line interfaces for OCaml
+EAPI=7
+HOMEPAGE=http://erratique.ch/software/cmdliner
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/findlib:=
+RESTRICT=!test? ( test )
+SLOT=0/1.0.4
+SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=fa31397adcd09f4b23a3afa750ad4788
diff --git a/metadata/md5-cache/dev-ml/core-0.9.1-r1 b/metadata/md5-cache/dev-ml/core-0.9.1-r1
index d6683af2f1a7..5a9be4f9e2f2 100644
--- a/metadata/md5-cache/dev-ml/core-0.9.1-r1
+++ b/metadata/md5-cache/dev-ml/core-0.9.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/configurator:= dev-ml/core_kernel:= dev-ml/ppx_assert:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/base:= dev-ml/configurator:= dev-ml/core_kernel:= dev-ml/ppx_assert:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Jane Street's alternative to the standard library
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/core
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/configurator:= dev-ml/core_kernel:= dev-ml/ppx_assert:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/core/archive/v0.9.1.tar.gz -> core-0.9.1.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=df4572d1e1b80028c10da6de7016e9ff
diff --git a/metadata/md5-cache/dev-ml/core-0.9.2 b/metadata/md5-cache/dev-ml/core-0.9.2
index cf1757627ff9..613bee68a172 100644
--- a/metadata/md5-cache/dev-ml/core-0.9.2
+++ b/metadata/md5-cache/dev-ml/core-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/configurator:= dev-ml/core_kernel:= dev-ml/ppx_assert:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/base:= dev-ml/configurator:= dev-ml/core_kernel:= dev-ml/ppx_assert:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Jane Street's alternative to the standard library
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/core
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/configurator:= dev-ml/core_kernel:= dev-ml/ppx_assert:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/sexplib:= dev-ml/spawn:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.2
 SRC_URI=https://github.com/janestreet/core/archive/v0.9.2.tar.gz -> core-0.9.2.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=aee3b69142b609b9a4a6bf0f5895800f
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.6 b/metadata/md5-cache/dev-ml/cppo-1.6.6
new file mode 100644
index 000000000000..5634a7029935
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cppo-1.6.6
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ocamlbuild >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=An equivalent of the C preprocessor for OCaml programs
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-community/cppo/
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-ml/ocamlbuild >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/1.6.6
+SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.6.tar.gz -> cppo-1.6.6.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=52708aa6115cbfb15792fa38b31d5a9d
diff --git a/metadata/md5-cache/dev-ml/csexp-1.3.2 b/metadata/md5-cache/dev-ml/csexp-1.3.2
new file mode 100644
index 000000000000..863bd53fc5ab
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/csexp-1.3.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/result:= test? ( dev-ml/ppx_expect ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Parsing and printing of S-expressions in Canonical form
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-dune/csexp
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/1.3.2
+SRC_URI=https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=e8f038f74eb7108caa743627ed2f143f
diff --git a/metadata/md5-cache/dev-ml/cudf-0.9 b/metadata/md5-cache/dev-ml/cudf-0.9
new file mode 100644
index 000000000000..86aa71bf1229
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/cudf-0.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-libs/glib:2 test? ( dev-ml/ounit2 ) dev-ml/findlib dev-ml/ocamlbuild dev-lang/perl
+DESCRIPTION=Library to parse, pretty print, and evaluate CUDF documents
+EAPI=7
+HOMEPAGE=http://www.mancoosi.org/cudf/
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/extlib:= dev-libs/glib:2
+RESTRICT=!test? ( test )
+SLOT=0/0.9
+SRC_URI=https://gforge.inria.fr/frs/download.php/file/36602/cudf-0.9.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f07a9f4980d83a4645ea070535775be2
diff --git a/metadata/md5-cache/dev-ml/dns-1.0.0 b/metadata/md5-cache/dev-ml/dns-1.0.0
index c10213ba5f1a..512afef23aa6 100644
--- a/metadata/md5-cache/dev-ml/dns-1.0.0
+++ b/metadata/md5-cache/dev-ml/dns-1.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder >=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-3.0.2:=[ppx] dev-ml/ocaml-hashcons:= >=dev-ml/ocaml-ipaddr-2.6.0:= dev-ml/ocaml-re:= >=dev-ml/ocaml-uri-1.7.0:= dev-ml/result:= !dev-ml/odns >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/jbuilder >=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-3.0.2:=[ppx] dev-ml/ocaml-hashcons:= >=dev-ml/ocaml-ipaddr-2.6.0:= dev-ml/ocaml-re:= >=dev-ml/ocaml-uri-1.7.0:= dev-ml/result:= !dev-ml/odns >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=A pure OCaml implementation of the DNS protocol
 EAPI=5
 HOMEPAGE=https://github.com/mirage/ocaml-dns https://mirage.io
@@ -9,5 +9,5 @@ RDEPEND=>=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-3.0.2:=[ppx] dev-ml
 RESTRICT=test
 SLOT=0/1.0.0
 SRC_URI=https://github.com/mirage/dns/archive/v1.0.0.tar.gz -> ocaml-dns-1.0.0.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=6ce03d8214e5fe840ad2c595ed1061f5
diff --git a/metadata/md5-cache/dev-ml/dose3-5.0.1-r1 b/metadata/md5-cache/dev-ml/dose3-5.0.1-r1
new file mode 100644
index 000000000000..1ca48d5e3332
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dose3-5.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/cudf:= >=dev-ml/extlib-1.7.0:= dev-ml/re:= parmap? ( dev-ml/parmap:= ) zip? ( dev-ml/camlzip:= ) bzip2? ( dev-ml/camlbz2:= ) >=dev-ml/ocamlgraph-1.8.6:= xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm ) dev-ml/findlib dev-ml/ocamlbuild dev-ml/cppo test? ( dev-python/pyyaml[libyaml] )
+DESCRIPTION=Library to perform analysis on package repositories
+EAPI=7
+HOMEPAGE=http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose
+IUSE=+ocamlopt parmap zip bzip2 xml curl rpm4 test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/cudf:= >=dev-ml/extlib-1.7.0:= dev-ml/re:= parmap? ( dev-ml/parmap:= ) zip? ( dev-ml/camlzip:= ) bzip2? ( dev-ml/camlbz2:= ) >=dev-ml/ocamlgraph-1.8.6:= xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) curl? ( dev-ml/ocurl:= ) rpm4? ( app-arch/rpm )
+RESTRICT=test
+SLOT=0/5.0.1
+SRC_URI=https://gforge.inria.fr/frs/download.php/file/36063/dose3-5.0.1.tar.gz
+_md5_=a614d3550b3ae14c0f222e93764f36f4
diff --git a/metadata/md5-cache/dev-ml/dune-2.7.1 b/metadata/md5-cache/dev-ml/dune-2.7.1
new file mode 100644
index 000000000000..943e5b19a724
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-2.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install
+DEPEND=dev-lang/ocaml
+DESCRIPTION=A composable build system for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/dune
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-lang/ocaml !dev-ml/jbuilder
+RESTRICT=test
+SLOT=0/2.7.1
+SRC_URI=https://github.com/ocaml/dune/archive/2.7.1.tar.gz -> dune-2.7.1.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=189fd83a2e7879d7e367ce2189619c24
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.7.1 b/metadata/md5-cache/dev-ml/dune-configurator-2.7.1
new file mode 100644
index 000000000000..37f882869563
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.7.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-ml/dune-private-libs:= dev-ml/csexp:= test? ( dev-ml/ppx_expect ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=A composable build system for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/dune
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/dune-private-libs:= dev-ml/csexp:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.7.1
+SRC_URI=https://github.com/ocaml/dune/archive/2.7.1.tar.gz -> dune-2.7.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=e435b4c5697604889b5ca6d89b8b0f7c
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.7.1 b/metadata/md5-cache/dev-ml/dune-private-libs-2.7.1
new file mode 100644
index 000000000000..12b328d1e919
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-2.7.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ml/csexp:= dev-ml/findlib:= test? ( dev-ml/ppx_expect ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=A composable build system for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/dune
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/csexp:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/2.7.1
+SRC_URI=https://github.com/ocaml/dune/archive/2.7.1.tar.gz -> dune-2.7.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=d2ea8b4cced2c73af38ae88c818cca30
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.7 b/metadata/md5-cache/dev-ml/extlib-1.7.7
new file mode 100644
index 000000000000..4f8cc080d74f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/cppo >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Standard library extensions for O'Caml
+EAPI=7
+HOMEPAGE=https://github.com/ygrek/ocaml-extlib
+IUSE=doc +ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=LGPL-2.1
+RDEPEND=dev-lang/ocaml:=[ocamlopt?]
+SLOT=0/1.7.7
+SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.7.tar.gz -> extlib-1.7.7.tar.gz
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7f88bdcc861880ca2cf13556a5ddeaa9
diff --git a/metadata/md5-cache/dev-ml/fieldslib-0.14.0 b/metadata/md5-cache/dev-ml/fieldslib-0.14.0
new file mode 100644
index 000000000000..6dee94a677ab
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/fieldslib-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Folding over record fields
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/fieldslib
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/fieldslib/archive/v0.14.0.tar.gz -> fieldslib-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=c1524b1bf5e61c51bbbbec88da5ac53c
diff --git a/metadata/md5-cache/dev-ml/findlib-1.8.1-r1 b/metadata/md5-cache/dev-ml/findlib-1.8.1-r1
new file mode 100644
index 000000000000..491f90726a64
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/findlib-1.8.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+DESCRIPTION=OCaml tool to find/use non-standard packages
+EAPI=7
+HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
+IUSE=doc +ocamlopt tk
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+SLOT=0
+SRC_URI=http://download.camlcity.org/download/findlib-1.8.1.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2c29554c34af590f1f61b0770e81affd
diff --git a/metadata/md5-cache/dev-ml/fmt-0.8.4 b/metadata/md5-cache/dev-ml/fmt-0.8.4
index 9642ad6f5559..90a7db045b48 100644
--- a/metadata/md5-cache/dev-ml/fmt-0.8.4
+++ b/metadata/md5-cache/dev-ml/fmt-0.8.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-ml/topkg-0.9 dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-ml/cmdliner:=[ocamlopt] >=dev-ml/topkg-0.9 dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Combinators to devise OCaml Format pretty-printing functions
 EAPI=5
 HOMEPAGE=https://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
@@ -10,5 +10,5 @@ RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/uchar:=[ocam
 RESTRICT=!test? ( test )
 SLOT=0/0.8.4
 SRC_URI=https://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=0943fd6eb645f0ad044ac64e6ad1fbc9
diff --git a/metadata/md5-cache/dev-ml/fpath-0.7.2 b/metadata/md5-cache/dev-ml/fpath-0.7.2
index 8b9bc215d207..485d1a911b84 100644
--- a/metadata/md5-cache/dev-ml/fpath-0.7.2
+++ b/metadata/md5-cache/dev-ml/fpath-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-ml/result:= dev-ml/astring:= dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/result:= dev-ml/astring:= dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=File system paths for OCaml
 EAPI=6
 HOMEPAGE=https://erratique.ch/software/fpath https://github.com/dbuenzli/fpath
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/astring:= >=dev-lang/ocaml-4:=
 SLOT=0/0.7.2
 SRC_URI=https://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=2fea3947c7078d4c95c57f18739c79a9
diff --git a/metadata/md5-cache/dev-ml/integers-0.4.0 b/metadata/md5-cache/dev-ml/integers-0.4.0
new file mode 100644
index 000000000000..9aa2a58006a4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/integers-0.4.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Various signed and unsigned integer types for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocamllabs/ocaml-integers
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.4.0
+SRC_URI=https://github.com/ocamllabs/ocaml-integers/archive/0.4.0.tar.gz -> integers-0.4.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=8cd380366d0e686920182cad40aa02a3
diff --git a/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0 b/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
new file mode 100644
index 000000000000..7f58c5a267f0
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Jane Street header files
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/jane-street-headers
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/jane-street-headers/archive/v0.14.0.tar.gz -> jane-street-headers-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=a3c050bca490799e15ca058b6d3404c0
diff --git a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14 b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
index 9dbe34c7f088..e1b45260fd00 100644
--- a/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
+++ b/metadata/md5-cache/dev-ml/jbuilder-1.0_beta14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DEPEND=test? ( dev-ml/menhir ) >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=test? ( dev-ml/menhir ) >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=A composable build system for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/janestreet/jbuilder
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0_beta14
 SRC_URI=https://github.com/janestreet/jbuilder/archive/1.0+beta14.tar.gz -> jbuilder-1.0-beta14.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=c506b3bd50e5dc7af6ef1e8ceab4a7b5
diff --git a/metadata/md5-cache/dev-ml/jst-config-0.14.0 b/metadata/md5-cache/dev-ml/jst-config-0.14.0
new file mode 100644
index 000000000000..c04af912d9b8
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/jst-config-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Compile-time configuration for Jane Street libraries
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/jst-config
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/jst-config/archive/v0.14.0.tar.gz -> jst-config-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=8f936ca80a44eb73659fec28160fdd1b
diff --git a/metadata/md5-cache/dev-ml/lablgtk-3.1.1 b/metadata/md5-cache/dev-ml/lablgtk-3.1.1
new file mode 100644
index 000000000000..bc062280906c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/lablgtk-3.1.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=app-text/gtkspell:3= x11-libs/gtk+:3= dev-ml/cairo2:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=OCaml bindings to GTK-3
+EAPI=7
+HOMEPAGE=https://github.com/garrigue/lablgtk
+IUSE=+ocamlopt sourceview
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+PDEPEND=sourceview? ( dev-ml/lablgtk-sourceview:3/3.1.1 )
+RDEPEND=app-text/gtkspell:3= x11-libs/gtk+:3= dev-ml/cairo2:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=3/3.1.1
+SRC_URI=https://github.com/garrigue/lablgtk/releases/download/3.1.1/lablgtk3-3.1.1.tbz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=493d7daede9b89a0bacad2300912ed58
diff --git a/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1 b/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1
new file mode 100644
index 000000000000..f074f97e9455
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=x11-libs/gtksourceview:3.0= >=dev-ml/lablgtk-3.1.1:3= dev-ml/cairo2:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=OCaml bindings to GTK-3
+EAPI=7
+HOMEPAGE=https://github.com/garrigue/lablgtk
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=x11-libs/gtksourceview:3.0= >=dev-ml/lablgtk-3.1.1:3= dev-ml/cairo2:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=3/3.1.1
+SRC_URI=https://github.com/garrigue/lablgtk/releases/download/3.1.1/lablgtk3-3.1.1.tbz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=16bb5956487f9f75d7f866a0722b7963
diff --git a/metadata/md5-cache/dev-ml/lwt-5.3.0 b/metadata/md5-cache/dev-ml/lwt-5.3.0
new file mode 100644
index 000000000000..8e35fcf658e3
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/lwt-5.3.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/seq:= dev-ml/result:= dev-ml/mmap:= dev-ml/ocplib-endian:= >=dev-ml/ppxlib-0.18.0:= dev-ml/react:= dev-ml/dune-configurator:= dev-libs/libev dev-ml/cppo dev-ml/findlib >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Cooperative light-weight thread library for OCaml
+EAPI=7
+HOMEPAGE=http://ocsigen.org/lwt
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-ml/seq:= dev-ml/result:= dev-ml/mmap:= dev-ml/ocplib-endian:= >=dev-ml/ppxlib-0.18.0:= dev-ml/react:= dev-ml/dune-configurator:= dev-libs/libev !<www-servers/ocsigen-1.1 >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/5.3.0
+SRC_URI=https://github.com/ocsigen/lwt/archive/5.3.0.tar.gz -> lwt-5.3.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=a8ee20528e19e72cf566b18ac42cf949
diff --git a/metadata/md5-cache/dev-ml/lwt_ssl-1.1.1 b/metadata/md5-cache/dev-ml/lwt_ssl-1.1.1
index d703f6ccdddf..53cf6df52267 100644
--- a/metadata/md5-cache/dev-ml/lwt_ssl-1.1.1
+++ b/metadata/md5-cache/dev-ml/lwt_ssl-1.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/lwt-3.1:= >=dev-ml/ocaml-ssl-0.4.0:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=>=dev-ml/lwt-3.1:= >=dev-ml/ocaml-ssl-0.4.0:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=GLib integration for Lwt
 EAPI=5
 HOMEPAGE=http://ocsigen.org/lwt
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-ml/lwt-3.1:= >=dev-ml/ocaml-ssl-0.4.0:= >=dev-lang/ocaml-4:=
 SLOT=0/1.1.1
 SRC_URI=https://github.com/ocsigen/lwt/archive/lwt_ssl-1.1.1.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=6c0c83196eb5aebe7ccd078109a2b78b
diff --git a/metadata/md5-cache/dev-ml/mccs-1.1.11 b/metadata/md5-cache/dev-ml/mccs-1.1.11
new file mode 100644
index 000000000000..e67005686310
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/mccs-1.1.11
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/cudf:= sci-mathematics/glpk:= test? ( dev-ml/extlib:= ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Multi Criteria CUDF Solver
+EAPI=7
+HOMEPAGE=http://www.i3s.unice.fr/~cpjm/misc/ https://github.com/AltGr/ocaml-mccs/issues
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-ml/cudf:= sci-mathematics/glpk:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/1.1.11
+SRC_URI=https://github.com/AltGr/ocaml-mccs/archive/1.1+11.tar.gz -> mccs-1.1.11.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=00d0dbaabf6ebcbc4afa90cee2f2bf00
diff --git a/metadata/md5-cache/dev-ml/mmap-1.0.2 b/metadata/md5-cache/dev-ml/mmap-1.0.2
new file mode 100644
index 000000000000..caf985fb6b81
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/mmap-1.0.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=File mapping
+EAPI=7
+HOMEPAGE=https://github.com/mirage/mmap
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/1.0.2
+SRC_URI=https://github.com/mirage/mmap/releases/download/v1.0.2/mmap-v1.0.2.tbz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=71847b0c4cad353e1720ff52ef3e3fbd
diff --git a/metadata/md5-cache/dev-ml/mtime-1.1.0 b/metadata/md5-cache/dev-ml/mtime-1.1.0
index 0c5e7b1ad89a..8a3ae6157017 100644
--- a/metadata/md5-cache/dev-ml/mtime-1.1.0
+++ b/metadata/md5-cache/dev-ml/mtime-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=OCaml module to access monotonic wall-clock time
 EAPI=5
 HOMEPAGE=https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/ocaml:=[ocamlopt] javascript? ( dev-ml/js_of_ocaml:= ) >=dev-la
 RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=https://erratique.ch/software/mtime/releases/mtime-1.1.0.tbz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	opam	c053036d04fbcede5c53fe5752699eb5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	opam	4f1cff0457cf4790a5510753a67d1cc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=93c7bbb805f54c67e55b061897770193
diff --git a/metadata/md5-cache/dev-ml/num-1.3-r1 b/metadata/md5-cache/dev-ml/num-1.3-r1
new file mode 100644
index 000000000000..cdfdf4b91dd2
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/num-1.3-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt]
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt] >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Library for arbitrary-precision integer and rational arithmetic
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/num
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt]
+SLOT=0
+SRC_URI=https://github.com/ocaml/num/archive/v1.3.tar.gz -> num-1.3.tar.gz
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1ae4a812dd3988b04af213da624f0d09
diff --git a/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0 b/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0
index df047ae903ab..2f0d7c6d4291 100644
--- a/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-base64-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder test? ( dev-ml/rresult dev-ml/bos dev-ml/alcotest ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/jbuilder test? ( dev-ml/rresult dev-ml/bos dev-ml/alcotest ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Library for radix-64 representation (de)coding
 EAPI=6
 HOMEPAGE=https://github.com/mirage/ocaml-base64
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/2.2.0
 SRC_URI=https://github.com/mirage/ocaml-base64/archive/v2.2.0.tar.gz -> ocaml-base64-2.2.0.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=f0d607f5775ed53b334dd4e6437651f1
diff --git a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3 b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
new file mode 100644
index 000000000000..5a275fbec643
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Repackage the OCaml compiler libs so they do not expose everything at toplevel
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ocaml-compiler-libs
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.12.3
+SRC_URI=https://github.com/janestreet/ocaml-compiler-libs/archive/v0.12.3.tar.gz -> ocaml-compiler-libs-0.12.3.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=eea5ce676853febd95c37c82da1b04c1
diff --git a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0 b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0
index f67b89f9ec07..7ae5d8a2ef12 100644
--- a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0
+++ b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Repackage the OCaml compiler libs so they do not expose everything at toplevel
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ocaml-compiler-libs
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ocaml-compiler-libs/archive/v0.9.0.tar.gz -> ocaml-compiler-libs-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=85278258dffbf8bdfe72848d2ed4c816
diff --git a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1 b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
index 8ff107489d29..14daaa6f0ee7 100644
--- a/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
+++ b/metadata/md5-cache/dev-ml/ocaml-cstruct-3.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/jbuilder test? ( dev-ml/ounit ppx? ( dev-ml/ppx_driver dev-ml/ppx_sexp_conv ) ) async? ( dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/core_kernel:= ) lwt? ( dev-ml/lwt:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/ppx_tools_versioned-5.0.1:= ) dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/jbuilder test? ( dev-ml/ounit ppx? ( dev-ml/ppx_driver dev-ml/ppx_sexp_conv ) ) async? ( dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/core_kernel:= ) lwt? ( dev-ml/lwt:= ) ppx? ( dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= >=dev-ml/ppx_tools_versioned-5.0.1:= ) dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Map OCaml arrays onto C-like structs
 EAPI=5
 HOMEPAGE=https://github.com/mirage/ocaml-cstruct https://mirage.io
@@ -10,5 +10,5 @@ RDEPEND=async? ( dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/core_kernel:=
 RESTRICT=!test? ( test )
 SLOT=0/3.1.1
 SRC_URI=https://github.com/mirage/ocaml-cstruct/archive/v3.1.1.tar.gz -> ocaml-cstruct-3.1.1.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=7baef6bed6fb57211c8515e34f89827f
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
new file mode 100644
index 000000000000..ea59dd4a0e07
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:0/7 dev-ml/integers:= test? ( dev-ml/ounit2 dev-ml/lwt ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Library for binding to C libraries using pure OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:0/7 dev-ml/integers:=
+SLOT=0/0.17.1
+SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.17.1.tar.gz -> ocaml-ctypes-0.17.1.tar.gz
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=b0dcbcba3a4c1d8c5e8f7c651246c3be
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1 b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
new file mode 100644
index 000000000000..dea8d190a48e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?] test? ( dev-ml/ounit2 ) >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=OCaml bindings for expat
+EAPI=7
+HOMEPAGE=https://github.com/whitequark/ocaml-expat
+IUSE=doc +ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+SLOT=0/1.1.0
+SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.1.0.tar.gz -> ocaml-expat-1.1.0.tar.gz
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=e15216b63a018f21711236b3bcc380fa
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
index b360c439e167..7a6ab2c9b125 100644
--- a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
+++ b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
@@ -1,5 +1,6 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-ml/ounit-2.0.0 >=dev-ml/stdlib-shims-0.2.0 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune
+DEPEND=>=dev-ml/ounit-2.0.0 >=dev-ml/stdlib-shims-0.2.0 >=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=Pure OCaml functions to manipulate real file (POSIX like) and filename
 EAPI=7
 HOMEPAGE=https://github.com/gildor478/ocaml-fileutils
@@ -9,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/gildor478/ocaml-fileutils/releases/download/v0.6.2/fileutils-v0.6.2.tbz -> ocaml-fileutils-0.6.2.tar.bz2
-_eclasses_=dune	48ca398457cfa7b91da98c276b97db03
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
 _md5_=2e4c663a2e3f92c4d18d6a1774dd65f5
diff --git a/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0 b/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
index 237b420f1d1f..496253c9a128 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
+++ b/metadata/md5-cache/dev-ml/ocaml-ipaddr-2.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-lang/ocaml:=[ocamlopt?] dev-ml/jbuilder dev-ml/findlib test? ( dev-ml/ounit ) >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-lang/ocaml:=[ocamlopt?] dev-ml/jbuilder dev-ml/findlib test? ( dev-ml/ounit ) >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=OCaml library for manipulation of IP (and MAC) address representations
 EAPI=5
 HOMEPAGE=https://github.com/mirage/ocaml-ipaddr
@@ -10,5 +10,5 @@ RDEPEND=dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_typ
 RESTRICT=!test? ( test )
 SLOT=0/2.8.0
 SRC_URI=https://github.com/mirage/ocaml-ipaddr/archive/2.8.0.tar.gz -> ocaml-ipaddr-2.8.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=bd5949dbdf484129d9b3b6ad716fb3cb
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.5 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.5
index f5f794ba213b..5780976cc19f 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/result:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/result:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Convert OCaml parsetrees between different major versions
 EAPI=6
 HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/1.0.5
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.5.tar.gz -> ocaml-migrate-parsetree-1.0.5.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.6 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.6
index 17d1eb114d4f..f6ff13015b48 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.6
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/result:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/result:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Convert OCaml parsetrees between different major versions
 EAPI=6
 HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/1.0.6
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.6.tar.gz -> ocaml-migrate-parsetree-1.0.6.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.7 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.7
index 1da512b6de2c..81fa132f8aa7 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.7
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/result:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/result:= dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Convert OCaml parsetrees between different major versions
 EAPI=6
 HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/1.0.7
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.0.7.tar.gz -> ocaml-migrate-parsetree-1.0.7.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=a7fc26cc5faf6788d179572ea4635368
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.0.0 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.0.0
new file mode 100644
index 000000000000..9350d4da3e4c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.0.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ppx_derivers >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Convert OCaml parsetrees between different major versions
+EAPI=7
+HOMEPAGE=https://github.com/let-def/ocaml-migrate-parsetree
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/ppx_derivers >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.0.0
+SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v2.0.0.tar.gz -> ocaml-migrate-parsetree-2.0.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=9714f8228fde948d69d81c266f938b46
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
index 18fa386319da..b84aad06b785 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=>=dev-db/sqlite-3.3.3 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=>=dev-db/sqlite-3.3.3 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=A package for ocaml that provides access to SQLite databases
 EAPI=5
 HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-lang/ocaml-4:=
 SLOT=0/4.2.0
 SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/4.2.0/sqlite3-4.2.0.tbz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=44715ecd1904679f92c6006b7c107848
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0
index f9f102d081ee..576628b0bd2a 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=>=dev-db/sqlite-3.3.3 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=>=dev-db/sqlite-3.3.3 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=A package for ocaml that provides access to SQLite databases
 EAPI=5
 HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-lang/ocaml-4:=
 SLOT=0/4.3.0
 SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/4.3.0/sqlite3-4.3.0.tbz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=44715ecd1904679f92c6006b7c107848
diff --git a/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4 b/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
index 719e6786b3e4..ddb423e6efb0 100644
--- a/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
+++ b/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ocaml-re:= dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-ml/stringext:= dev-ml/type-conv:= test? ( >=dev-ml/ounit-1.0.2 ) dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ocaml-re:= dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_core:= dev-ml/ppx_type_conv:= dev-ml/stringext:= dev-ml/type-conv:= test? ( >=dev-ml/ounit-1.0.2 ) dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=RFC3986 URI parsing library for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/mirage/ocaml-uri https://mirage.io
@@ -10,5 +10,5 @@ RDEPEND=dev-ml/ocaml-re:= dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_cor
 RESTRICT=!test? ( test )
 SLOT=0/1.9.4
 SRC_URI=https://github.com/mirage/ocaml-uri/archive/v1.9.4.tar.gz -> ocaml-uri-1.9.4.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=366defb3d072a037c03ab776d2b4fffe
diff --git a/metadata/md5-cache/dev-ml/ocamlweb-1.41 b/metadata/md5-cache/dev-ml/ocamlweb-1.41
new file mode 100644
index 000000000000..f74ab5e61b59
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocamlweb-1.41
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=>=dev-lang/ocaml-4.08.0:= virtual/latex-base dev-texlive/texlive-latexextra virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=O'Caml literate programming tool
+EAPI=7
+HOMEPAGE=https://www.lri.fr/~filliatr/ocamlweb/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=LGPL-2
+RDEPEND=virtual/latex-base
+SLOT=0
+SRC_URI=https://www.lri.fr/~filliatr/ftp/ocamlweb/ocamlweb-1.41.tar.gz
+_eclasses_=latex-package	e5f296c98696dd02059bc6a5a03282e2
+_md5_=f2b4a8483d514ed7d81477bb5d3e84a6
diff --git a/metadata/md5-cache/dev-ml/ocplib-endian-1.1 b/metadata/md5-cache/dev-ml/ocplib-endian-1.1
new file mode 100644
index 000000000000..f450684da5eb
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocplib-endian-1.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/cppo-1.1.0 >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Functions to read and write int16/32/64 from strings, bytes, and bigarrays
+EAPI=7
+HOMEPAGE=https://github.com/OCamlPro/ocplib-endian
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/1.1
+SRC_URI=https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz -> ocplib-endian-1.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=5e7010b789af6f853ee0c649f79c1a26
diff --git a/metadata/md5-cache/dev-ml/octavius-1.1.0 b/metadata/md5-cache/dev-ml/octavius-1.1.0
index 17eedc59ff7c..5bc910649674 100644
--- a/metadata/md5-cache/dev-ml/octavius-1.1.0
+++ b/metadata/md5-cache/dev-ml/octavius-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/jbuilder dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=ocamldoc comment syntax parser
 EAPI=6
 HOMEPAGE=https://github.com/ocaml-doc/octavius
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/1.1.0
 SRC_URI=https://github.com/ocaml-doc/octavius/archive/v1.1.0.tar.gz -> octavius-1.1.0.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=cbcb5b3732af72b5c28797739eaf0f15
diff --git a/metadata/md5-cache/dev-ml/octavius-1.2.2 b/metadata/md5-cache/dev-ml/octavius-1.2.2
new file mode 100644
index 000000000000..465b16221c87
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/octavius-1.2.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=ocamldoc comment syntax parser
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-doc/octavius
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/1.2.2
+SRC_URI=https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz -> octavius-1.2.2.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=eadea30ad44e443ff1044bad0829663e
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.7 b/metadata/md5-cache/dev-ml/opam-2.0.7
new file mode 100644
index 000000000000..436f0ebdedac
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-2.0.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= dev-ml/opam-client:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=A source-based package manager for OCaml
+EAPI=7
+HOMEPAGE=http://opam.ocaml.org/
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= dev-ml/opam-client:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.0.7
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=b3d1891a4a7e52f29aecc1d57f6ae845
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.7 b/metadata/md5-cache/dev-ml/opam-client-2.0.7
new file mode 100644
index 000000000000..4e6db1d08033
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/opam-state:= dev-ml/opam-file-format:= dev-ml/re:= dev-ml/opam-solver:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam client libraries
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/opam-state:= dev-ml/opam-file-format:= dev-ml/re:= dev-ml/opam-solver:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.0.7
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=4f9b57db9d6c80a63fff0e48bf125046
diff --git a/metadata/md5-cache/dev-ml/opam-core-2.0.7 b/metadata/md5-cache/dev-ml/opam-core-2.0.7
new file mode 100644
index 000000000000..e15ff65ecee3
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-core-2.0.7
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/ocaml
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
+DESCRIPTION=Core libraries for opam
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
+SLOT=0/2.0.7
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
+_md5_=bab1877ac6d62be91524dd45f51a666b
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.1.0 b/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
new file mode 100644
index 000000000000..72f35f37f919
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Parser and printer for the opam file syntax
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/opam-file-format
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-lang/ocaml:=[ocamlopt?]
+SLOT=0/2.1.0
+SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.1.0.tar.gz -> opam-file-format-2.1.0.tar.gz
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=6d98f22d18205eb8cb983ccb6fe97991
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.7 b/metadata/md5-cache/dev-ml/opam-format-2.0.7
new file mode 100644
index 000000000000..012a9c268f2f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.7
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/ocaml
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-ml/opam-core:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=
+DESCRIPTION=Core libraries for opam
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/opam-core:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=
+SLOT=0/2.0.7
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
+_md5_=f3b9526d65a5bedadb66bf1631b9f0d5
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.0.7 b/metadata/md5-cache/dev-ml/opam-installer-2.0.7
new file mode 100644
index 000000000000..52a5368e4493
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.0.7
@@ -0,0 +1,13 @@
+BDEPEND=dev-lang/ocaml
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-lang/ocaml-4.02.3 >=dev-lang/ocaml-4:=
+DESCRIPTION=Core installer for opam packages
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ocaml-4.02.3 >=dev-lang/ocaml-4:=
+SLOT=0/2.0.7
+SRC_URI=https://github.com/ocaml/opam/releases/download/2.0.7/opam-full-2.0.7.tar.gz
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
+_md5_=f370ba94d1398561f6f953e6b9768f5b
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.7 b/metadata/md5-cache/dev-ml/opam-repository-2.0.7
new file mode 100644
index 000000000000..a3bff878e81b
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.7
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/opam-format:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam repository libraries
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/opam-format:= dev-ml/re:= dev-ml/dose3:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/2.0.7
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=d22e84c54bd26463f8d0311731896f6c
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.7 b/metadata/md5-cache/dev-ml/opam-solver-2.0.7
new file mode 100644
index 000000000000..6564605f6f76
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/opam-format:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= test? ( dev-ml/opam-client ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam solver
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/opam-format:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= dev-ml/dose3:= dev-ml/cudf:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.0.7
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=34e0953b75c518f1c76e856e28585fb1
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.7 b/metadata/md5-cache/dev-ml/opam-state-2.0.7
new file mode 100644
index 000000000000..861a374c79f4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.7
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-ml/opam-repository:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=opam state libraries
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=LGPL-2.1
+RDEPEND=dev-ml/opam-repository:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/2.0.7
+SRC_URI=https://github.com/ocaml/opam/archive/2.0.7.tar.gz -> opam-2.0.7.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=cb7f77f74e207ed0735e0ddcf4ca0f68
diff --git a/metadata/md5-cache/dev-ml/ounit2-2.2.3 b/metadata/md5-cache/dev-ml/ounit2-2.2.3
new file mode 100644
index 000000000000..d9b7b32d7895
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ounit2-2.2.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/lwt:= dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Unit testing framework for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/gildor478/ounit
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/lwt:= dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/2.2.3
+SRC_URI=https://github.com/gildor478/ounit/releases/download/v2.2.3/ounit-v2.2.3.tbz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=24c0b372de18e94338a4a5929fef4cbd
diff --git a/metadata/md5-cache/dev-ml/parsexp-0.14.0 b/metadata/md5-cache/dev-ml/parsexp-0.14.0
new file mode 100644
index 000000000000..0d8fb0a11c6f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/parsexp-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/sexplib0:= dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=S-expression parsing library
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/parsexp
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/sexplib0:= dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/parsexp/archive/v0.14.0.tar.gz -> parsexp-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=20c6a448054e8dba8084d1084b6a79bc
diff --git a/metadata/md5-cache/dev-ml/patience_diff-0.9.0 b/metadata/md5-cache/dev-ml/patience_diff-0.9.0
index 809f6d4022ca..c3dfe085423d 100644
--- a/metadata/md5-cache/dev-ml/patience_diff-0.9.0
+++ b/metadata/md5-cache/dev-ml/patience_diff-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Tool and library implementing patience diff
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/patience_diff
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/patience_diff/archive/v0.9.0.tar.gz -> patience_diff-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=6db3632c82627bb161c0d80cda005c72
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0
index cac9b6a9eaf7..efc96a0180a2 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-libs/libpcre-4.5 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=>=dev-libs/libpcre-4.5 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
 EAPI=5
 HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
 SLOT=0/7.3.0
 SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.3.0/pcre-7.3.0.tbz -> pcre-ocaml-7.3.0.tbz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=17bd7c9eba564490e9b777bc5ae7ca30
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2
index f93603047b63..cbf022717342 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-libs/libpcre-4.5 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=>=dev-libs/libpcre-4.5 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
 EAPI=5
 HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
 SLOT=0/7.3.2
 SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.3.2/pcre-7.3.2.tbz -> pcre-ocaml-7.3.2.tbz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=17bd7c9eba564490e9b777bc5ae7ca30
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3
index 869dd2d3935e..6b6c3edbe483 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-libs/libpcre-4.5 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=>=dev-libs/libpcre-4.5 dev-ml/jbuilder dev-ml/base dev-ml/stdio dev-ml/configurator >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Perl Compatibility Regular Expressions for O'Caml
 EAPI=5
 HOMEPAGE=http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-libs/libpcre-4.5 >=dev-lang/ocaml-4:=
 SLOT=0/7.3.3
 SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.3.3/pcre-7.3.3.tbz -> pcre-ocaml-7.3.3.tbz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=17bd7c9eba564490e9b777bc5ae7ca30
diff --git a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0 b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
new file mode 100644
index 000000000000..de4fcab0939e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_cold:= dev-ml/ppx_compare:= dev-ml/ppx_here:= dev-ml/ppx_sexp_conv:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Assert-like extension nodes that raise useful errors on failure
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_assert
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppx_cold:= dev-ml/ppx_compare:= dev-ml/ppx_here:= dev-ml/ppx_sexp_conv:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_assert/archive/v0.14.0.tar.gz -> ppx_assert-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=ff82f78187a1b8286fb78ff27c533251
diff --git a/metadata/md5-cache/dev-ml/ppx_assert-0.9.0 b/metadata/md5-cache/dev-ml/ppx_assert-0.9.0
index 2db8358f2628..edc45befc923 100644
--- a/metadata/md5-cache/dev-ml/ppx_assert-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_assert-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Assert-like extension nodes that raise useful errors on failure
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_assert
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_assert/archive/v0.9.0.tar.gz -> ppx_assert-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=0b7b46991c8396fb9131499d74e1d319
diff --git a/metadata/md5-cache/dev-ml/ppx_ast-0.9.1 b/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
index 3f7b042392f9..6467ffd4debc 100644
--- a/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_ast-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=AST used in Jane Street ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_ast
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/ppx_ast/archive/v0.9.1.tar.gz -> ppx_ast-0.9.1.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=2f8970af9000908999d6184d066c41bb
diff --git a/metadata/md5-cache/dev-ml/ppx_base-0.14.0 b/metadata/md5-cache/dev-ml/ppx_base-0.14.0
new file mode 100644
index 000000000000..3a510411ec5e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_base-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ppx_compare:= dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_js_style:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_cold:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Base set of ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_base
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/ppx_compare:= dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_js_style:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_cold:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_base/archive/v0.14.0.tar.gz -> ppx_base-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=a9f14398cb3ad582ffa0585af2cc9c98
diff --git a/metadata/md5-cache/dev-ml/ppx_base-0.9.0 b/metadata/md5-cache/dev-ml/ppx_base-0.9.0
index 1b0e19e3058e..2a9a55f97005 100644
--- a/metadata/md5-cache/dev-ml/ppx_base-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_base-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_compare:= dev-ml/ppx_driver:= dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_js_style:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_compare:= dev-ml/ppx_driver:= dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_js_style:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Base set of ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_base
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_compare:= dev-ml/ppx_driver:= dev-ml/ppx_enumerate:= dev-ml/ppx_hash:= dev-ml/ppx_js_style:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_base/archive/v0.9.0.tar.gz -> ppx_base-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=d2eda158fb743ca8beea2f0c327bd1ef
diff --git a/metadata/md5-cache/dev-ml/ppx_bench-0.14.1 b/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
new file mode 100644
index 000000000000..aa5d73dd8662
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ppx_inline_test:= dev-ml/ppxlib:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Syntax extension for writing in-line benchmarks in ocaml code
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_bench
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/ppx_inline_test:= dev-ml/ppxlib:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/ppx_bench/archive/v0.14.1.tar.gz -> ppx_bench-0.14.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=3d92d49722b5e7bc92825e3e0443bba3
diff --git a/metadata/md5-cache/dev-ml/ppx_bench-0.9.1 b/metadata/md5-cache/dev-ml/ppx_bench-0.9.1
index 26fef8f05809..265dae9c93ee 100644
--- a/metadata/md5-cache/dev-ml/ppx_bench-0.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_bench-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Syntax extension for writing in-line benchmarks in ocaml code
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_bench
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/ppx_bench/archive/v0.9.1.tar.gz -> ppx_bench-0.9.1.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=d32aca086ea3a8eb8da9ba91a7502155
diff --git a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0 b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
new file mode 100644
index 000000000000..4edbd39d6820
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/bin_prot:= dev-ml/ppx_here:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= test? ( dev-ml/ppx_jane ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Generation of bin_prot readers and writers from types
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_bin_prot
+IUSE=+ocamlopt test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/bin_prot:= dev-ml/ppx_here:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_bin_prot/archive/v0.14.0.tar.gz -> ppx_bin_prot-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=ed8b300c3e432f80eb4a36558e53920b
diff --git a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.9.0 b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.9.0
index c7c729e6c223..72b3fdfbb420 100644
--- a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/bin-prot:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/bin-prot:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Generation of bin_prot readers and writers from types
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_bin_prot
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/bin-prot:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_bin_prot/archive/v0.9.0.tar.gz -> ppx_bin_prot-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=ab5c3768ecdd8c3acd769013aa10380e
diff --git a/metadata/md5-cache/dev-ml/ppx_cold-0.14.0 b/metadata/md5-cache/dev-ml/ppx_cold-0.14.0
new file mode 100644
index 000000000000..36b3ee4742fa
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_cold-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Expands [@cold] into [@inline never][@specialise never][@local never]
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_cold
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_cold/archive/v0.14.0.tar.gz -> ppx_cold-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=ac106bb56be2a44fb04ee1b7d489855d
diff --git a/metadata/md5-cache/dev-ml/ppx_compare-0.14.0 b/metadata/md5-cache/dev-ml/ppx_compare-0.14.0
new file mode 100644
index 000000000000..e0635ac60aee
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_compare-0.14.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Generation of comparison functions from types
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_compare
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_compare/archive/v0.14.0.tar.gz -> ppx_compare-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=f1e5a7d6d3d4ec28ae064a63e923e975
diff --git a/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1
index 2e1e46a538fd..15706aa0260c 100644
--- a/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_compare-0.9.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_core:= dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_metaquot:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_core:= dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_metaquot:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Generation of comparison functions from types
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_compare
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_core:= dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_metaquot:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_compare/archive/v0.9.0.tar.gz -> ppx_compare-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=2dca3048f5f3c64b14e7150d0c45c0ea
diff --git a/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
index 33526b31d99b..5a439f6de23a 100644
--- a/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_core-0.9.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/ocaml-compiler-libs:= dev-ml/ppx_ast:= dev-ml/ppx_traverse_builtins:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/base:= dev-ml/ocaml-compiler-libs:= dev-ml/ppx_ast:= dev-ml/ppx_traverse_builtins:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Standard library for ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_core
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ocaml-compiler-libs:= dev-ml/ppx_ast:= dev-ml/ppx_traverse_builtins:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_core/archive/v0.9.0.tar.gz -> ppx_core-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=39357472dfc94cf45b643e5eb2246f52
diff --git a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0 b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
new file mode 100644
index 000000000000..b9de39ab23b1
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_sexp_conv:= >=dev-ml/ppxlib-0.18.0:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Printf-style format-strings for user-defined string conversion
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_custom_printf
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppx_sexp_conv:= >=dev-ml/ppxlib-0.18.0:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_custom_printf/archive/v0.14.0.tar.gz -> ppx_custom_printf-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=7e42ff93c70f454396d701cbc819e17b
diff --git a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0-r1
index 91aa65049c17..7acc8669521e 100644
--- a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.9.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_traverse dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_traverse dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Printf-style format-strings for user-defined string conversion
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_custom_printf
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_traverse dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_custom_printf/archive/v0.9.0.tar.gz -> ppx_custom_printf-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=1e7b4d1bba9283bd7d0922c3ff71f77f
diff --git a/metadata/md5-cache/dev-ml/ppx_derivers-1.0 b/metadata/md5-cache/dev-ml/ppx_derivers-1.0
index d505b3ba7f67..6dbd10d04e39 100644
--- a/metadata/md5-cache/dev-ml/ppx_derivers-1.0
+++ b/metadata/md5-cache/dev-ml/ppx_derivers-1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Shared [@@deriving] plugin registry
 EAPI=6
 HOMEPAGE=https://github.com/diml/ppx_derivers
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/1.0
 SRC_URI=https://github.com/diml/ppx_derivers/archive/1.0.tar.gz -> ppx_derivers-1.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=db65d659fb2c39bbe68597337ed82d5d
diff --git a/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1 b/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
new file mode 100644
index 000000000000..8a83eaaaccd1
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Shared [@@deriving] plugin registry
+EAPI=7
+HOMEPAGE=https://github.com/diml/ppx_derivers
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=BSD
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/1.2.1
+SRC_URI=https://github.com/diml/ppx_derivers/archive/1.2.1.tar.gz -> ppx_derivers-1.2.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=5ebe68c17965ae347b5c9de871c0a7a3
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1 b/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
index ae69b7b212ec..b9a86f96160f 100644
--- a/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
+++ b/metadata/md5-cache/dev-ml/ppx_deriving-4.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/result:= dev-ml/cppo test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/result:= dev-ml/cppo test? ( dev-ml/ounit ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Type-driven code generation for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/ocaml-ppx/ppx_deriving
@@ -10,5 +10,5 @@ RDEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:
 RESTRICT=!test? ( test )
 SLOT=0/4.2
 SRC_URI=https://github.com/ocaml-ppx/ppx_deriving/archive/v4.2.tar.gz -> ppx_deriving-4.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	opam	c053036d04fbcede5c53fe5752699eb5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	opam	4f1cff0457cf4790a5510753a67d1cc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=50a684a5c7daf6fd58e4ac8b3df38370
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-4.5 b/metadata/md5-cache/dev-ml/ppx_deriving-4.5
new file mode 100644
index 000000000000..512bab52ad1f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_deriving-4.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/result:= dev-ml/cppo dev-ml/ppxfind test? ( dev-ml/ounit2 ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Type-driven code generation for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-ppx/ppx_deriving
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/4.5
+SRC_URI=https://github.com/ocaml-ppx/ppx_deriving/archive/v4.5.tar.gz -> ppx_deriving-4.5.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=b250f87479705f04cd83161ffdae9a8c
diff --git a/metadata/md5-cache/dev-ml/ppx_driver-0.11.0 b/metadata/md5-cache/dev-ml/ppx_driver-0.11.0
new file mode 100644
index 000000000000..a5a7b1928870
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_driver-0.11.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Feature-full driver for OCaml AST transformers
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_driver
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.11.0
+SRC_URI=https://github.com/janestreet/ppx_driver/archive/v0.11.0.tar.gz -> ppx_driver-0.11.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=112d66fa612dea180032f1d1fd159421
diff --git a/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1 b/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1
index 0c71e74aa60e..c93684830f0d 100644
--- a/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1
+++ b/metadata/md5-cache/dev-ml/ppx_driver-0.9.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Feature-full driver for OCaml AST transformers
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_driver
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocamlbuild:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/ppx_driver/archive/v0.9.1.tar.gz -> ppx_driver-0.9.1.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=5eebc7208b78283faaf55e931f0c6ec1
diff --git a/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0 b/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
new file mode 100644
index 000000000000..7c0ecd0dfee5
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Generate a list containing all values of a finite type
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_enumerate
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_enumerate/archive/v0.14.0.tar.gz -> ppx_enumerate-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=fdeea4065d4dd2b39535e24ceea19793
diff --git a/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0 b/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0
index 7742416533a9..ad815a18ef70 100644
--- a/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_enumerate-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Generate a list containing all values of a finite type
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_enumerate
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_enumerate/archive/v0.9.0.tar.gz -> ppx_enumerate-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=5d2b37c4d7c7350ca9bfee645c938f02
diff --git a/metadata/md5-cache/dev-ml/ppx_expect-0.14.0 b/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
new file mode 100644
index 000000000000..9887b6dbf326
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_variants_conv:= dev-ml/stdio:= >=dev-ml/ppxlib-0.18.0:= dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/re:= test? ( dev-ml/ppx_jane ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Cram like framework for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_expect
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_custom_printf:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_variants_conv:= dev-ml/stdio:= >=dev-ml/ppxlib-0.18.0:= dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.14.0.tar.gz -> ppx_expect-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=904321c6be93c3655888bd288b0f777e
diff --git a/metadata/md5-cache/dev-ml/ppx_expect-0.9.0 b/metadata/md5-cache/dev-ml/ppx_expect-0.9.0
index 1b534abfed66..219b60be7002 100644
--- a/metadata/md5-cache/dev-ml/ppx_expect-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_traverse:= dev-ml/ppx_variants_conv:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocaml-re:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_traverse:= dev-ml/ppx_variants_conv:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocaml-re:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Cram like framework for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_expect
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_traverse:= dev-ml/ppx_variants_conv:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ocaml-re:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.9.0.tar.gz -> ppx_expect-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=de04ea3737696aa4d6ce8eacba8c8d99
diff --git a/metadata/md5-cache/dev-ml/ppx_fail-0.14.0 b/metadata/md5-cache/dev-ml/ppx_fail-0.14.0
new file mode 100644
index 000000000000..8ceaf2ff4de4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_fail-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_here:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Add location to calls to failwiths
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_fail
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppx_here:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_fail/archive/v0.14.0.tar.gz -> ppx_fail-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=dde573ac79d2b5134753c6ed5ff7a804
diff --git a/metadata/md5-cache/dev-ml/ppx_fail-0.9.0 b/metadata/md5-cache/dev-ml/ppx_fail-0.9.0
index 3c5eb5d01a11..aa9f6edebf9c 100644
--- a/metadata/md5-cache/dev-ml/ppx_fail-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_fail-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Add location to calls to failwiths
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_fail
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_fail/archive/v0.9.0.tar.gz -> ppx_fail-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=a68b871d171c9d63f11e06827910681e
diff --git a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
new file mode 100644
index 000000000000..f5972bd8732f
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/fieldslib:= >=dev-ml/ppxlib-0.18.0:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Generation of accessor and iteration functions for ocaml records
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_fields_conv
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/fieldslib:= >=dev-ml/ppxlib-0.18.0:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/ppx_fields_conv/archive/v0.14.1.tar.gz -> ppx_fields_conv-0.14.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=2472a39a97e38ac891ec8a23e96d98cd
diff --git a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.9.0-r1
index 1c71af24060d..3e436d3ac407 100644
--- a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.9.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/fieldslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/fieldslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Generation of accessor and iteration functions for ocaml records
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_fields_conv
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/fieldslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_fields_conv/archive/v0.9.0.tar.gz -> ppx_fields_conv-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=553274bc3d71f529cb5de9b8bcd16d7b
diff --git a/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0 b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
new file mode 100644
index 000000000000..ad9ddef2e466
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Simpler notation for fixed point literals
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_fixed_literal
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_fixed_literal/archive/v0.14.0.tar.gz -> ppx_fixed_literal-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=910dcde1aa527f31405707f1aaef5f1d
diff --git a/metadata/md5-cache/dev-ml/ppx_hash-0.14.0 b/metadata/md5-cache/dev-ml/ppx_hash-0.14.0
new file mode 100644
index 000000000000..45b6a282bb7c
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_hash-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= >=dev-ml/ppx_compare-0.10.0:= dev-ml/ppx_sexp_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=PPX rewriter that generates hash functions from type expressions and definitions
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_hash
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= >=dev-ml/ppx_compare-0.10.0:= dev-ml/ppx_sexp_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_hash/archive/v0.14.0.tar.gz -> ppx_hash-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=12453d9b04ce56150c8268b2e45fd420
diff --git a/metadata/md5-cache/dev-ml/ppx_hash-0.9.0 b/metadata/md5-cache/dev-ml/ppx_hash-0.9.0
index ab7badfb8cdb..073889c036ce 100644
--- a/metadata/md5-cache/dev-ml/ppx_hash-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_hash-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=PPX rewriter that generates hash functions from type expressions and definitions
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_hash
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_hash/archive/v0.9.0.tar.gz -> ppx_hash-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=6f24bade222da199f0aac381d0540358
diff --git a/metadata/md5-cache/dev-ml/ppx_here-0.14.0 b/metadata/md5-cache/dev-ml/ppx_here-0.14.0
new file mode 100644
index 000000000000..d8cf3c1dc428
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_here-0.14.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Expands [%here] into its location
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_here
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-compiler-libs:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_here/archive/v0.14.0.tar.gz -> ppx_here-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=d93010c75da4c5ed7ecf460dc4340a3e
diff --git a/metadata/md5-cache/dev-ml/ppx_here-0.9.1 b/metadata/md5-cache/dev-ml/ppx_here-0.9.1
index 5964193256c2..e03492f90f95 100644
--- a/metadata/md5-cache/dev-ml/ppx_here-0.9.1
+++ b/metadata/md5-cache/dev-ml/ppx_here-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Expands [%here] into its location
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_here
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/ppx_here/archive/v0.9.1.tar.gz -> ppx_here-0.9.1.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=ec049e275302db6b5e6652389ae76e96
diff --git a/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1 b/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
new file mode 100644
index 000000000000..89666681af77
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/ppxlib:= dev-ml/ocaml-compiler-libs:= dev-ml/time_now:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Syntax extension for writing in-line tests in ocaml code
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_inline_test
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/ppxlib:= dev-ml/ocaml-compiler-libs:= dev-ml/time_now:= >=dev-lang/ocaml-4:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/ppx_inline_test/archive/v0.14.1.tar.gz -> ppx_inline_test-0.14.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=5713c92b90cf1d0702445606c1fd9bc6
diff --git a/metadata/md5-cache/dev-ml/ppx_inline_test-0.9.2 b/metadata/md5-cache/dev-ml/ppx_inline_test-0.9.2
index 3922487ca456..f65692d3e34f 100644
--- a/metadata/md5-cache/dev-ml/ppx_inline_test-0.9.2
+++ b/metadata/md5-cache/dev-ml/ppx_inline_test-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/base:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Syntax extension for writing in-line tests in ocaml code
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_inline_test
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.2
 SRC_URI=https://github.com/janestreet/ppx_inline_test/archive/v0.9.2.tar.gz -> ppx_inline_test-0.9.2.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=23e500527a4d90eb7bd226d64561078a
diff --git a/metadata/md5-cache/dev-ml/ppx_jane-0.14.0 b/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
new file mode 100644
index 000000000000..98741b4081a7
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base_quickcheck:= dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_bench:= dev-ml/ppx_bin_prot:= dev-ml/ppx_custom_printf:= dev-ml/ppx_expect:= dev-ml/ppx_fail:= dev-ml/ppx_fields_conv:= dev-ml/ppx_fixed_literal:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_let:= dev-ml/ppx_module_timer:= dev-ml/ppx_optcomp:= dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/ppx_stable:= dev-ml/ppx_string:= dev-ml/ppx_typerep_conv:= dev-ml/ppx_variants_conv:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Standard Jane Street ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_jane
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base_quickcheck:= dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_bench:= dev-ml/ppx_bin_prot:= dev-ml/ppx_custom_printf:= dev-ml/ppx_expect:= dev-ml/ppx_fail:= dev-ml/ppx_fields_conv:= dev-ml/ppx_fixed_literal:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_let:= dev-ml/ppx_module_timer:= dev-ml/ppx_optcomp:= dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/ppx_stable:= dev-ml/ppx_string:= dev-ml/ppx_typerep_conv:= dev-ml/ppx_variants_conv:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_jane/archive/v0.14.0.tar.gz -> ppx_jane-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=acb8dbd72a2c7ed3dea8d97e05cb2b75
diff --git a/metadata/md5-cache/dev-ml/ppx_jane-0.9.0 b/metadata/md5-cache/dev-ml/ppx_jane-0.9.0
index 5f5a4c1621ef..e950de402b5d 100644
--- a/metadata/md5-cache/dev-ml/ppx_jane-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_jane-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_bench:= dev-ml/ppx_bin_prot:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_expect:= dev-ml/ppx_fail:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_let:= dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/ppx_typerep_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_bench:= dev-ml/ppx_bin_prot:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_expect:= dev-ml/ppx_fail:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_let:= dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/ppx_typerep_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Standard Jane Street ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_jane
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_bench:= dev-ml/ppx_bin_prot:= dev-ml/ppx_custom_printf:= dev-ml/ppx_driver:= dev-ml/ppx_expect:= dev-ml/ppx_fail:= dev-ml/ppx_fields_conv:= dev-ml/ppx_here:= dev-ml/ppx_inline_test:= dev-ml/ppx_let:= dev-ml/ppx_optional:= dev-ml/ppx_pipebang:= dev-ml/ppx_sexp_message:= dev-ml/ppx_sexp_value:= dev-ml/ppx_typerep_conv:= dev-ml/ppx_type_conv:= dev-ml/ppx_variants_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_jane/archive/v0.9.0.tar.gz -> ppx_jane-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=0d947eb68cb8c2fe3a9358b43cf40433
diff --git a/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0 b/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
new file mode 100644
index 000000000000..ffa33fba55d4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/octavius:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Code style checker for Jane Street Packages
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_js_style
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/octavius:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_js_style/archive/v0.14.0.tar.gz -> ppx_js_style-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=8442f938cecf79d5af75d8b995072630
diff --git a/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0 b/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0
index d7e2e3966288..9f022aaa0235 100644
--- a/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_js_style-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/octavius:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/octavius:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Code style checker for Jane Street Packages
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_js_style
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/octavius:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_js_style/archive/v0.9.0.tar.gz -> ppx_js_style-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=2c76d118f31c13292ce2ccc5461e0f61
diff --git a/metadata/md5-cache/dev-ml/ppx_let-0.14.0 b/metadata/md5-cache/dev-ml/ppx_let-0.14.0
new file mode 100644
index 000000000000..a847ed13b287
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_let-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Monadic let-bindings
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_let
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_let/archive/v0.14.0.tar.gz -> ppx_let-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=d73cb450225229605baf60f6cef72cfe
diff --git a/metadata/md5-cache/dev-ml/ppx_let-0.9.0 b/metadata/md5-cache/dev-ml/ppx_let-0.9.0
index 95aa65019355..3dcb51965419 100644
--- a/metadata/md5-cache/dev-ml/ppx_let-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_let-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Monadic let-bindings
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_let
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_let/archive/v0.9.0.tar.gz -> ppx_let-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=bfa40a81a5c7944f7e5c9ec28e6b46cb
diff --git a/metadata/md5-cache/dev-ml/ppx_metaquot-0.11.0 b/metadata/md5-cache/dev-ml/ppx_metaquot-0.11.0
new file mode 100644
index 000000000000..3276d9314ffd
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_metaquot-0.11.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Write OCaml AST fragment using OCaml syntax
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_metaquot
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.11.0
+SRC_URI=https://github.com/janestreet/ppx_metaquot/archive/v0.11.0.tar.gz -> ppx_metaquot-0.11.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=d5ec5db9a8862ff64ed6d2efee890ff1
diff --git a/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0 b/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0
index e3d1cc2c361f..2847c8843b7a 100644
--- a/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_metaquot-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_core-100 dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_core-100 dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Write OCaml AST fragment using OCaml syntax
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_metaquot
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_traverse_builtins:= dev-ml/ocaml-migrate-parsetree:= <dev-ml/ppx_core-100 >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_metaquot/archive/v0.9.0.tar.gz -> ppx_metaquot-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=b48d9680cabd3835456dd060028f00fc
diff --git a/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0 b/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
new file mode 100644
index 000000000000..f1f12e6abf54
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_base:= dev-ml/stdio:= dev-ml/time_now:= dev-ml/ppxlib:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Ppx rewriter that records top-level module startup times
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_module_timer
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-ml/base:= dev-ml/ppx_base:= dev-ml/stdio:= dev-ml/time_now:= dev-ml/ppxlib:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_module_timer/archive/v0.14.0.tar.gz -> ppx_module_timer-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=3aa136d6235ef83f021e1d704cd14bb8
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
new file mode 100644
index 000000000000..06f649d3d446
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/stdio:= >=dev-ml/ppxlib-0.18.0:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Optional compilation for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_optcomp
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/stdio:= >=dev-ml/ppxlib-0.18.0:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_optcomp/archive/v0.14.0.tar.gz -> ppx_optcomp-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=b2d9940a64417257bb44afa90ce77d5a
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3
index c905985880bb..bbae38120da4 100644
--- a/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Optional compilation for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_optcomp
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_optcomp/archive/v0.9.0.tar.gz -> ppx_optcomp-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=a9c5ecff4f30e97f0ce2a20248452e78
diff --git a/metadata/md5-cache/dev-ml/ppx_optional-0.14.0 b/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
new file mode 100644
index 000000000000..b18299efba8d
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Pattern matching on flat options
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_optional
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_optional/archive/v0.14.0.tar.gz -> ppx_optional-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=fac29e077f0b9c5bdd9c643f94289780
diff --git a/metadata/md5-cache/dev-ml/ppx_optional-0.9.0 b/metadata/md5-cache/dev-ml/ppx_optional-0.9.0
index f0239749f603..7c1157858356 100644
--- a/metadata/md5-cache/dev-ml/ppx_optional-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_optional-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Pattern matching on flat options
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_optional
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_optional/archive/v0.9.0.tar.gz -> ppx_optional-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=5dd1adaf06b098bdf0a2da2f1f53866a
diff --git a/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0 b/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
new file mode 100644
index 000000000000..74ad816b8dfd
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=A ppx rewriter that inlines reverse application operators |> and |!
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_pipebang
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_pipebang/archive/v0.14.0.tar.gz -> ppx_pipebang-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=eec24220100dfa16ec6f38ae2964a1a5
diff --git a/metadata/md5-cache/dev-ml/ppx_pipebang-0.9.0 b/metadata/md5-cache/dev-ml/ppx_pipebang-0.9.0
index adf20d608ebb..6e97cb7c2997 100644
--- a/metadata/md5-cache/dev-ml/ppx_pipebang-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_pipebang-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=A ppx rewriter that inlines reverse application operators |> and |!
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_pipebang
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_pipebang/archive/v0.9.0.tar.gz -> ppx_pipebang-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=7da0c4090a518ede339e19e9aafb644f
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
new file mode 100644
index 000000000000..b155b57372db
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-ml/ppxlib-0.18.0:= dev-ml/ocaml-compiler-libs:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Support Library for type-driven code generators
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-ml/ppxlib-0.18.0:= dev-ml/ocaml-compiler-libs:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz -> ppx_sexp_conv-0.14.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=db172a87bcec5e6af2a10c5170d6ec4c
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1
index 981d7298abcf..dd65d4c0e3b3 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.9.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_metaquot:= dev-ml/ppx_optcomp:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_metaquot:= dev-ml/ppx_optcomp:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Support Library for type-driven code generators
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_conv
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_type_conv:= dev-ml/ppx_metaquot:= dev-ml/ppx_optcomp:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_traverse_builtins:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.9.0.tar.gz -> ppx_sexp_conv-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=e35c4add784e5c4d871a691fc4cd8ead
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0 b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
new file mode 100644
index 000000000000..375dcccf0799
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_here:= dev-ml/ppx_sexp_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-ml/ppxlib-0.18.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=A ppx rewriter for easy construction of s-expressions
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_sexp_message
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppx_here:= dev-ml/ppx_sexp_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-ml/ppxlib-0.18.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_sexp_message/archive/v0.14.0.tar.gz -> ppx_sexp_message-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=3f19bb94058891fcb9c1df9c55772612
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.9.0 b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.9.0
index 21a027444b5a..239cae8ecc0d 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=A ppx rewriter for easy construction of s-expressions
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_message
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_message/archive/v0.9.0.tar.gz -> ppx_sexp_message-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=f381bdbc035f18f7fdab24cb4a9e13c8
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0 b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
new file mode 100644
index 000000000000..fef5a1a8c704
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_here:= dev-ml/ppx_sexp_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Standard library for ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_sexp_value
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppx_here:= dev-ml/ppx_sexp_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/ppxlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/ppx_sexp_value/archive/v0.14.0.tar.gz -> ppx_sexp_value-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=e8c3f2e49e004d42d38464ac147d5137
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.9.0 b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.9.0
index abba7556e06d..9977513ff679 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Standard library for ppx rewriters
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_sexp_value
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_here:= dev-ml/ppx_metaquot:= dev-ml/ppx_sexp_conv:= dev-ml/sexplib:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_value/archive/v0.9.0.tar.gz -> ppx_sexp_value-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=31666963ef78f649771038191855c3f6
diff --git a/metadata/md5-cache/dev-ml/ppx_stable-0.14.1 b/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
new file mode 100644
index 000000000000..127a0747f28e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Stable types conversions generator
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_stable
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/ppx_stable/archive/v0.14.1.tar.gz -> ppx_stable-0.14.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=1dd8731409fb3165b4e6f50da8609b54
diff --git a/metadata/md5-cache/dev-ml/ppx_string-0.14.1 b/metadata/md5-cache/dev-ml/ppx_string-0.14.1
new file mode 100644
index 000000000000..15288495f654
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_string-0.14.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/stdio:= dev-ml/ppx_base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Ppx extension for string interpolation
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_string
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/stdio:= dev-ml/ppx_base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/ppx_string/archive/v0.14.1.tar.gz -> ppx_string-0.14.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=ef46beff6c8621ba8bf6928e6738fd98
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-6.2 b/metadata/md5-cache/dev-ml/ppx_tools-6.2
new file mode 100644
index 000000000000..96fa7b2f4d70
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_tools-6.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Tools for authors of ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/alainfrisch/ppx_tools
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/6.2
+SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/6.2.tar.gz -> ppx_tools-6.2.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=90bcbc3c0290fa4f0205d601bb8d792c
diff --git a/metadata/md5-cache/dev-ml/ppx_traverse-0.9.0 b/metadata/md5-cache/dev-ml/ppx_traverse-0.9.0
index fc2d437f8d3a..d11b5a0c1b6f 100644
--- a/metadata/md5-cache/dev-ml/ppx_traverse-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_traverse-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Automatic generation of open recursion classes
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_traverse
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_traverse/archive/v0.9.0.tar.gz -> ppx_traverse-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=ea43b4900c7d52031ecc6dddcca7c011
diff --git a/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0 b/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0
index 8a91b9480b39..9d86e89ffce1 100644
--- a/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_traverse_builtins-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Builtins for ppx_traverse
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_traverse_builtins
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_traverse_builtins/archive/v0.9.0.tar.gz -> ppx_traverse_builtins-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=53f213a132b85b86d9c2c24544a9f989
diff --git a/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0 b/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0
index 95ccb1197b19..34328cffc219 100644
--- a/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_type_conv-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_core:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_deriving:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_core:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_deriving:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Support Library for type-driven code generators
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_type_conv
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_core:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_deriving:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_type_conv/archive/v0.9.0.tar.gz -> ppx_type_conv-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=afeb46c8e96915695f5d12fe37b59a9f
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1
new file mode 100644
index 000000000000..d98b6dbf9333
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/typerep:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Generation of runtime types from type declarations
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/typerep:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.1.tar.gz -> ppx_typerep_conv-0.14.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=e6b38d482aa6d84b195e31ead46abcdb
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.9.0 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.9.0
index 2efff565fa26..54a82d3b7a43 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/typerep:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/typerep:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Generation of runtime types from type declarations
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_typerep_conv
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/typerep:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.9.0.tar.gz -> ppx_typerep_conv-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=3d7c796e73f530b4ffc6369de466ce94
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
new file mode 100644
index 000000000000..4f29d113dd3a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/variantslib:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Generation of accessor and iteration functions for ocaml variant types
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/ppx_variants_conv
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/variantslib:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.1
+SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.14.1.tar.gz -> ppx_variants_conv-0.14.1.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=89bb8050977442303e811b1f9d705b14
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.9.0 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.9.0
index f11321330dd3..67cd339ea401 100644
--- a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/variantslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/variantslib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Generation of accessor and iteration functions for ocaml variant types
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/ppx_variants_conv
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= dev-ml/ppx_type_conv:= dev-ml/variantslib:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.9.0.tar.gz -> ppx_variants_conv-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=85b8cf52cb554cc85eb56bd818a193ea
diff --git a/metadata/md5-cache/dev-ml/ppxfind-1.4 b/metadata/md5-cache/dev-ml/ppxfind-1.4
new file mode 100644
index 000000000000..ffc1c4aa4398
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppxfind-1.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ocaml-migrate-parsetree:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=ocamlfind ppx tool
+EAPI=7
+HOMEPAGE=https://github.com/diml/ppxfind
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-ml/ocaml-migrate-parsetree:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/1.4
+SRC_URI=https://github.com/diml/ppxfind/releases/download/1.4/ppxfind-1.4.tbz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=cfc68f61dfdb6b30da545fb96f70d81e
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.18.0 b/metadata/md5-cache/dev-ml/ppxlib-0.18.0
new file mode 100644
index 000000000000..2a3e65e4b78a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.18.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/base-0.11.0:= >=dev-ml/ocaml-compiler-libs-0.11:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/result:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= dev-ml/ppx_derivers:= >=dev-ml/stdio-0.11.0:= test? ( dev-ml/cinaps ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Base library and tools for ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/ocaml-ppx/ppxlib
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/base-0.11.0:= >=dev-ml/ocaml-compiler-libs-0.11:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/result:= dev-ml/sexplib0:= dev-ml/stdlib-shims:= dev-ml/ppx_derivers:= >=dev-ml/stdio-0.11.0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.18.0
+SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.18.0.tar.gz -> ppxlib-0.18.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=cf9284dd2ca56b865455043d73d1e43d
diff --git a/metadata/md5-cache/dev-ml/re-1.9.0 b/metadata/md5-cache/dev-ml/re-1.9.0
new file mode 100644
index 000000000000..84a145ab7009
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/re-1.9.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=!dev-ml/ocaml-re dev-ml/seq:= test? ( dev-ml/ounit ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Regular expression library for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/ocaml-re
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2-with-linking-exception
+RDEPEND=!dev-ml/ocaml-re dev-ml/seq:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/1.9.0
+SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.9.0.tar.gz -> ocaml-re-1.9.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=5cf80ac3d60730cc5d5867d0e4b1fa72
diff --git a/metadata/md5-cache/dev-ml/re2-0.9.0 b/metadata/md5-cache/dev-ml/re2-0.9.0
index eedbbff21181..16b537146be1 100644
--- a/metadata/md5-cache/dev-ml/re2-0.9.0
+++ b/metadata/md5-cache/dev-ml/re2-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=OCaml bindings for RE2
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/re2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/re2/archive/v0.9.0.tar.gz -> re2-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=335c4c39c1a9d5394e07bbee3c2d66de
diff --git a/metadata/md5-cache/dev-ml/re2-0.9.1 b/metadata/md5-cache/dev-ml/re2-0.9.1
index c79aefe6f2b2..b84e2bf34a52 100644
--- a/metadata/md5-cache/dev-ml/re2-0.9.1
+++ b/metadata/md5-cache/dev-ml/re2-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=OCaml bindings for RE2
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/re2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/re2/archive/v0.9.1.tar.gz -> re2-0.9.1.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=335c4c39c1a9d5394e07bbee3c2d66de
diff --git a/metadata/md5-cache/dev-ml/react-1.2.1 b/metadata/md5-cache/dev-ml/react-1.2.1
index fd8b7cef41e0..636f3e0cd7cc 100644
--- a/metadata/md5-cache/dev-ml/react-1.2.1
+++ b/metadata/md5-cache/dev-ml/react-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install test
-DEPEND=dev-ml/findlib >=dev-ml/topkg-0.9 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/findlib >=dev-ml/topkg-0.9 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=OCaml module for functional reactive programming
 EAPI=5
 HOMEPAGE=https://erratique.ch/software/react https://github.com/dbuenzli/react
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.2.1
 SRC_URI=https://erratique.ch/software/react/releases/react-1.2.1.tbz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=5a249c84cb721faa3d4060208762d13e
diff --git a/metadata/md5-cache/dev-ml/react-1.2.1-r1 b/metadata/md5-cache/dev-ml/react-1.2.1-r1
new file mode 100644
index 000000000000..615fd97e68dc
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/react-1.2.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/opam-installer dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/findlib >=dev-ml/topkg-0.9 >=dev-lang/ocaml-4:=
+DESCRIPTION=OCaml module for functional reactive programming
+EAPI=7
+HOMEPAGE=http://erratique.ch/software/react https://github.com/dbuenzli/react
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ocaml-4:=
+RESTRICT=!test? ( test )
+SLOT=0/1.2.1
+SRC_URI=http://erratique.ch/software/react/releases/react-1.2.1.tbz
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
+_md5_=5f9b7da0ff7b05c46a40e24e6e824ad4
diff --git a/metadata/md5-cache/dev-ml/reactiveData-0.2.1 b/metadata/md5-cache/dev-ml/reactiveData-0.2.1
index 0430ed7affa0..fb2aa81bcacb 100644
--- a/metadata/md5-cache/dev-ml/reactiveData-0.2.1
+++ b/metadata/md5-cache/dev-ml/reactiveData-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-ml/react:= dev-ml/findlib dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/react:= dev-ml/findlib dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Functional reactive programming with incremental changes in data structures
 EAPI=5
 HOMEPAGE=https://github.com/ocsigen/reactiveData
@@ -9,5 +9,5 @@ LICENSE=LGPL-3-with-linking-exception
 RDEPEND=dev-ml/react:= >=dev-lang/ocaml-4:=
 SLOT=0/0.2.1
 SRC_URI=https://github.com/ocsigen/reactiveData/archive/0.2.1.tar.gz -> reactiveData-0.2.1.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=98d9f05c2bc8dc841646d2e6d240b8e3
diff --git a/metadata/md5-cache/dev-ml/reactiveData-9999 b/metadata/md5-cache/dev-ml/reactiveData-9999
index 60f7e00f23a9..4e8acb51bfc8 100644
--- a/metadata/md5-cache/dev-ml/reactiveData-9999
+++ b/metadata/md5-cache/dev-ml/reactiveData-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=dev-ml/react:= dev-ml/findlib dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-ml/react:= dev-ml/findlib dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam-installer >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Functional reactive programming with incremental changes in data structures
 EAPI=5
 HOMEPAGE=https://github.com/ocsigen/reactiveData
@@ -8,5 +8,5 @@ LICENSE=LGPL-3-with-linking-exception
 PROPERTIES=live
 RDEPEND=dev-ml/react:= >=dev-lang/ocaml-4:=
 SLOT=0/9999
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=98d9f05c2bc8dc841646d2e6d240b8e3
diff --git a/metadata/md5-cache/dev-ml/result-1.5 b/metadata/md5-cache/dev-ml/result-1.5
new file mode 100644
index 000000000000..6b1c2833a63a
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/result-1.5
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Compat result type
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/result
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/1.5
+SRC_URI=https://github.com/janestreet/result/archive/1.5.tar.gz -> result-1.5.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=89ff6f665c9c0753e609de38f95fde0f
diff --git a/metadata/md5-cache/dev-ml/rresult-0.5.0 b/metadata/md5-cache/dev-ml/rresult-0.5.0
index 0f78de77728a..aa57914ad2cd 100644
--- a/metadata/md5-cache/dev-ml/rresult-0.5.0
+++ b/metadata/md5-cache/dev-ml/rresult-0.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/result:= dev-ml/topkg dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Result value combinators for OCaml
 EAPI=6
 HOMEPAGE=https://erratique.ch/software/rresult https://github.com/dbuenzli/rresult
@@ -8,5 +8,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/result:= >=dev-lang/ocaml-4:=
 SLOT=0/0.5.0
 SRC_URI=https://erratique.ch/software/rresult/releases/rresult-0.5.0.tbz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=a9ddede575de757ac0c8b23dc94394cc
diff --git a/metadata/md5-cache/dev-ml/seq-1 b/metadata/md5-cache/dev-ml/seq-1
new file mode 100644
index 000000000000..ca6438516933
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/seq-1
@@ -0,0 +1,12 @@
+BDEPEND=dev-ml/opam-installer dev-lang/ocaml
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-lang/ocaml-4:=
+DESCRIPTION=Compatibility package for OCaml's standard iterator type starting from 4.07.
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/opam-repository/blob/master/packages/seq/seq.base/opam
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=public-domain
+RDEPEND=>=dev-lang/ocaml-4:=
+SLOT=0/1
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
+_md5_=92db90c4feb0a12b78360db475fb3c33
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.14.0 b/metadata/md5-cache/dev-ml/sexplib-0.14.0
new file mode 100644
index 000000000000..12fc86501de3
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/sexplib-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/parsexp:= dev-ml/base:= dev-ml/sexplib0:= dev-ml/num:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/sexplib
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/parsexp:= dev-ml/base:= dev-ml/sexplib0:= dev-ml/num:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/sexplib/archive/v0.14.0.tar.gz -> sexplib-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=7c346dfec668c72e3c055d1033fe6cb5
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.9.2 b/metadata/md5-cache/dev-ml/sexplib-0.9.2
index 5712c5a8f3e8..b5b0b000d1e8 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.9.2
+++ b/metadata/md5-cache/dev-ml/sexplib-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install test
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/sexplib
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.2
 SRC_URI=https://github.com/janestreet/sexplib/archive/v0.9.2.tar.gz -> sexplib-0.9.2.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=282a1dc214e669d93cbd747d5e9433bf
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.9.3 b/metadata/md5-cache/dev-ml/sexplib-0.9.3
index 8fefa876a059..49858664f2a2 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.9.3
+++ b/metadata/md5-cache/dev-ml/sexplib-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install test
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/sexplib
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.3
 SRC_URI=https://github.com/janestreet/sexplib/archive/v0.9.3.tar.gz -> sexplib-0.9.3.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=282a1dc214e669d93cbd747d5e9433bf
diff --git a/metadata/md5-cache/dev-ml/sexplib0-0.14.0 b/metadata/md5-cache/dev-ml/sexplib0-0.14.0
new file mode 100644
index 000000000000..ad1dfecbdeb9
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/sexplib0-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Library for automated conversion of OCaml-values to and from S-expressions
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/sexplib0
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/sexplib0/archive/v0.14.0.tar.gz -> sexplib0-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=7c866445e57651dc125f6e8998b24a88
diff --git a/metadata/md5-cache/dev-ml/spawn-0.9.0 b/metadata/md5-cache/dev-ml/spawn-0.9.0
index 008716d54e4a..562509c5ac95 100644
--- a/metadata/md5-cache/dev-ml/spawn-0.9.0
+++ b/metadata/md5-cache/dev-ml/spawn-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Spawning sub-processes
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/spawn
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/spawn/archive/v0.9.0.tar.gz -> spawn-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=efa61e05acee15c9104a3e2f5b0dae70
diff --git a/metadata/md5-cache/dev-ml/splittable_random-0.14.0 b/metadata/md5-cache/dev-ml/splittable_random-0.14.0
new file mode 100644
index 000000000000..8d1fa6ff891b
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/splittable_random-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_bench:= dev-ml/ppx_inline_test:= dev-ml/ppx_sexp_message:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=PRNG that can be split into independent streams
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/splittable_random
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_bench:= dev-ml/ppx_inline_test:= dev-ml/ppx_sexp_message:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/splittable_random/archive/v0.14.0.tar.gz -> splittable_random-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=5407f8120ff53d3cbd5674d2468d7e6d
diff --git a/metadata/md5-cache/dev-ml/stdio-0.14.0 b/metadata/md5-cache/dev-ml/stdio-0.14.0
new file mode 100644
index 000000000000..481d9eab13c9
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/stdio-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-ml/base-0.11.0:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Standard IO Library for OCaml
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/stdio
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/stdio/archive/v0.14.0.tar.gz -> stdio-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=aae3d3ac66f2ab3afee199bab9cc250a
diff --git a/metadata/md5-cache/dev-ml/stdio-0.9.0-r1 b/metadata/md5-cache/dev-ml/stdio-0.9.0-r1
index cf0aa7b59091..49bfd5dc2ff0 100644
--- a/metadata/md5-cache/dev-ml/stdio-0.9.0-r1
+++ b/metadata/md5-cache/dev-ml/stdio-0.9.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install test
-DEPEND=dev-ml/base:= dev-ml/sexplib:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/base:= dev-ml/sexplib:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Standard IO Library for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/stdio
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/sexplib:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/stdio/archive/v0.9.0.tar.gz -> stdio-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=e2dfb45e87ff0a6207348a54312c9e2f
diff --git a/metadata/md5-cache/dev-ml/stdio-0.9.1 b/metadata/md5-cache/dev-ml/stdio-0.9.1
index 4d91ff628626..5db5208816af 100644
--- a/metadata/md5-cache/dev-ml/stdio-0.9.1
+++ b/metadata/md5-cache/dev-ml/stdio-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install test
-DEPEND=dev-ml/base:= dev-ml/sexplib:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/base:= dev-ml/sexplib:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Standard IO Library for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/stdio
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/sexplib:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.1
 SRC_URI=https://github.com/janestreet/stdio/archive/v0.9.1.tar.gz -> stdio-0.9.1.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=e2dfb45e87ff0a6207348a54312c9e2f
diff --git a/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0 b/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
index 94f95976e0f7..0cf66421a9d0 100644
--- a/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
+++ b/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
@@ -1,13 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 DESCRIPTION=Pure OCaml library that allows replacing Pervasives with Stdlib before 4.08
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/stdlib-shims
 IUSE=ocamlopt
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/ocaml/stdlib-shims/releases/download/0.2.0/stdlib-shims-0.2.0.tbz
-_eclasses_=dune	48ca398457cfa7b91da98c276b97db03
-_md5_=67bcf920e12b0fa7b37a9fa455baf4a7
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=1058496ff690a306093a9622bda35e49
diff --git a/metadata/md5-cache/dev-ml/stringext-1.5.0 b/metadata/md5-cache/dev-ml/stringext-1.5.0
index bc96fe335972..3d82371dc93d 100644
--- a/metadata/md5-cache/dev-ml/stringext-1.5.0
+++ b/metadata/md5-cache/dev-ml/stringext-1.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/jbuilder test? ( dev-ml/iTeML ) >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/jbuilder test? ( dev-ml/iTeML ) >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Extra string functions for OCaml
 EAPI=6
 HOMEPAGE=https://github.com/rgrinberg/stringext
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/1.5.0
 SRC_URI=https://github.com/rgrinberg/stringext/archive/1.5.0.tar.gz -> stringext-1.5.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=6c33702dec8e27042484c71df5e0e8c1
diff --git a/metadata/md5-cache/dev-ml/textutils-0.9.0 b/metadata/md5-cache/dev-ml/textutils-0.9.0
index de297d3567c8..35c33b69ca96 100644
--- a/metadata/md5-cache/dev-ml/textutils-0.9.0
+++ b/metadata/md5-cache/dev-ml/textutils-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Text output utilities
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/textutils
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/core:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/textutils/archive/v0.9.0.tar.gz -> textutils-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=704a092f6d2caecf664702c91fec2df6
diff --git a/metadata/md5-cache/dev-ml/time_now-0.14.0 b/metadata/md5-cache/dev-ml/time_now-0.14.0
new file mode 100644
index 000000000000..9cc5ad73d187
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/time_now-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= dev-ml/jane-street-headers:= dev-ml/jst-config:= dev-ml/ppx_base:= dev-ml/ppx_optcomp:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Reports the current time
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/time_now
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-ml/base:= dev-ml/jane-street-headers:= dev-ml/jst-config:= dev-ml/ppx_base:= dev-ml/ppx_optcomp:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/time_now/archive/v0.14.0.tar.gz -> time_now-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=f9a636e5e7678a13731deaae40e26470
diff --git a/metadata/md5-cache/dev-ml/topkg-1.0.3 b/metadata/md5-cache/dev-ml/topkg-1.0.3
new file mode 100644
index 000000000000..87325c51e684
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/topkg-1.0.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:= >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=The transitory OCaml software packager
+EAPI=7
+HOMEPAGE=http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=ISC
+RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=
+SLOT=0/1.0.3
+SRC_URI=https://github.com/dbuenzli/topkg/archive/v1.0.3.tar.gz -> topkg-1.0.3.tar.gz
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=e54266c1c1a7e64522fe956568bc06d4
diff --git a/metadata/md5-cache/dev-ml/typerep-0.14.0 b/metadata/md5-cache/dev-ml/typerep-0.14.0
new file mode 100644
index 000000000000..7c2efb298e36
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/typerep-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Library for creating runtime representation of OCaml types
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/typerep
+IUSE=+ocamlopt
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/typerep/archive/v0.14.0.tar.gz -> typerep-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=994561e84bcdcf359a0c8ecf0f6fb4dd
diff --git a/metadata/md5-cache/dev-ml/typerep-0.9.0 b/metadata/md5-cache/dev-ml/typerep-0.9.0
index feffe9dade1c..6c83fc7563b3 100644
--- a/metadata/md5-cache/dev-ml/typerep-0.9.0
+++ b/metadata/md5-cache/dev-ml/typerep-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/base:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=Library for creating runtime representation of OCaml types
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/typerep
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/typerep/archive/v0.9.0.tar.gz -> typerep-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=9715ff2e47717286dc2a7c1dc71b7e5f
diff --git a/metadata/md5-cache/dev-ml/variantslib-0.14.0 b/metadata/md5-cache/dev-ml/variantslib-0.14.0
new file mode 100644
index 000000000000..0611b46909d2
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/variantslib-0.14.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=OCaml variants as first class values
+EAPI=7
+HOMEPAGE=https://github.com/janestreet/variantslib
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/0.14.0
+SRC_URI=https://github.com/janestreet/variantslib/archive/v0.14.0.tar.gz -> variantslib-0.14.0.tar.gz
+_eclasses_=dune	73a210262d124c8004f67ba1dd9ed873
+_md5_=04f835ba92809cbd0496ff82a4008e0f
diff --git a/metadata/md5-cache/dev-ml/variantslib-0.9.0 b/metadata/md5-cache/dev-ml/variantslib-0.9.0
index 6e409be637e0..54b9f83ebc6c 100644
--- a/metadata/md5-cache/dev-ml/variantslib-0.9.0
+++ b/metadata/md5-cache/dev-ml/variantslib-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=dev-ml/base:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/base:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= dev-ml/jbuilder >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=OCaml variants as first class values
 EAPI=6
 HOMEPAGE=https://github.com/janestreet/variantslib
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= >=dev-lang/ocaml-4:=
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/variantslib/archive/v0.9.0.tar.gz -> variantslib-0.9.0.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=d886530b2ff32238ab5fec6fc318d0e1
diff --git a/metadata/md5-cache/dev-ml/yojson-1.4.0 b/metadata/md5-cache/dev-ml/yojson-1.4.0
index cfa532cb5806..8f44f5e07aaa 100644
--- a/metadata/md5-cache/dev-ml/yojson-1.4.0
+++ b/metadata/md5-cache/dev-ml/yojson-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] >=dev-ml/biniou-1.2:=[ocamlopt] dev-ml/cppo dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] >=dev-ml/biniou-1.2:=[ocamlopt] dev-ml/cppo dev-ml/jbuilder >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=JSON parsing and pretty-printing library for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/mjambon/yojson
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.11:=[ocamlopt] dev-ml/easy-format:=[ocamlopt] >=dev-ml/biniou-1.2:=[ocamlopt] >=dev-lang/ocaml-4:=
 SLOT=0/1.4.0
 SRC_URI=https://github.com/mjambon/yojson/archive/v1.4.0.tar.gz -> yojson-1.4.0.tar.gz
-_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a	opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=fb6b0c3afce29897340daa4af070bbf4
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f09af2adc3ee..80424296ba60 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/args-0.1.0-r1 b/metadata/md5-cache/dev-python/args-0.1.0-r1
deleted file mode 100644
index de30408efad2..000000000000
--- a/metadata/md5-cache/dev-python/args-0.1.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Command Arguments for Humans
-EAPI=7
-HOMEPAGE=https://github.com/kennethreitz-archive/args
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/a/args/args-0.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b607fa48843e7aa35e113d19525530c1
diff --git a/metadata/md5-cache/dev-python/astor-0.8.1 b/metadata/md5-cache/dev-python/astor-0.8.1
index bfd3e1ab1b55..1972758a0a77 100644
--- a/metadata/md5-cache/dev-python/astor-0.8.1
+++ b/metadata/md5-cache/dev-python/astor-0.8.1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Read/rewrite/write Python ASTs
 EAPI=7
 HOMEPAGE=https://pypi.org/project/astor/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.8.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2844404a901b757512189edbfcac9a21
+_md5_=614b4fb52e8e09f1a4f2a9e0e730c246
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.23 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.23
index 28e4ba08cc3a..06c92df37fe7 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.23
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.23
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/flake8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/flake8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Standalone Python library for the catkin package system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/catkin_pkg
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !<dev-util/catkin-0.7.14 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-util/catkin-0.7.14 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.23.tar.gz -> catkin_pkg-0.4.23-gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=24cf09214153341c1c8c314c12a3ab7a
+_md5_=e71d305426a21c605d7eadaa3ace4740
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-9999 b/metadata/md5-cache/dev-python/catkin_pkg-9999
index e7399235f212..12e39a1fee9a 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-9999
+++ b/metadata/md5-cache/dev-python/catkin_pkg-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/flake8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/flake8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Standalone Python library for the catkin package system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/catkin_pkg
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !<dev-util/catkin-0.7.14 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-util/catkin-0.7.14 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=24cf09214153341c1c8c314c12a3ab7a
+_md5_=e71d305426a21c605d7eadaa3ace4740
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.38.0 b/metadata/md5-cache/dev-python/cfn-python-lint-0.38.0
new file mode 100644
index 000000000000..7ce3a5677969
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.38.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=7
+HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.38.0.tar.gz -> cfn-python-lint-0.38.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bf48ff0aae5af9c0b15c0f36b059a2d5
diff --git a/metadata/md5-cache/dev-python/empy-3.3.4 b/metadata/md5-cache/dev-python/empy-3.3.4
new file mode 100644
index 000000000000..c7783737e769
--- /dev/null
+++ b/metadata/md5-cache/dev-python/empy-3.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=A powerful and robust templating system for Python
+EAPI=6
+HOMEPAGE=http://www.alcyone.com/software/empy/
+IUSE=doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.4.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=79844e902beb6fd43a9bd0322ab8ec8b
diff --git a/metadata/md5-cache/dev-python/exdown-0.7.0 b/metadata/md5-cache/dev-python/exdown-0.7.0
new file mode 100644
index 000000000000..9aadfed09c34
--- /dev/null
+++ b/metadata/md5-cache/dev-python/exdown-0.7.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/wheel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extract code blocks from markdown
+EAPI=7
+HOMEPAGE=https://github.com/nschloe/exdown
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nschloe/exdown/archive/v0.7.0.tar.gz -> exdown-0.7.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=96260646355b6808ed40a5527a887f4a
diff --git a/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508 b/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
index ae1274137ee2..969aef457a21 100644
--- a/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
+++ b/metadata/md5-cache/dev-python/lcdproc-0.03_p20150508
@@ -4,11 +4,11 @@ DESCRIPTION=Python OOP wrapper library for LCDproc Telnet API
 EAPI=7
 HOMEPAGE=https://github.com/jinglemansweep/lcdproc
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=app-misc/lcdproc python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/jinglemansweep/lcdproc/archive/973628fc326177c9deaf3f2e1a435159eb565ae0.tar.gz -> lcdproc-0.03_p20150508.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=08d2b96d58adc05e0749fede3ea30b9f
+_md5_=5131608b56774638f6e3e2458a54a6fe
diff --git a/metadata/md5-cache/dev-python/lz4-3.0.2 b/metadata/md5-cache/dev-python/lz4-3.0.2
index 79f75a9f7c43..1a806cb315f1 100644
--- a/metadata/md5-cache/dev-python/lz4-3.0.2
+++ b/metadata/md5-cache/dev-python/lz4-3.0.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( app-arch/lz4 >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( app-arch/lz4 >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pkgconfig[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=app-arch/lz4 dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pkgconfig[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=LZ4 Bindings for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=app-arch/lz4 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=app-arch/lz4 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-3.0.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=354ac807c541af79a5a62ed0651f7e7f
+_md5_=0dcdb1b3c3d7d79fd80fec6cd9084656
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.5.1 b/metadata/md5-cache/dev-python/marshmallow-3.5.1
index 810e2cd2603b..9ca900db7203 100644
--- a/metadata/md5-cache/dev-python/marshmallow-3.5.1
+++ b/metadata/md5-cache/dev-python/marshmallow-3.5.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=A lightweight library for converting complex datatypes to and from native Python datatypes.
 EAPI=7
 HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
-IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.5.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7c708aeacbf87d5d2eea34175d340c06
+_md5_=1f4b7a1bd07431b0785dc7ed4cafd853
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
index e213b982bcf7..afab9334315f 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/miniupnpc-2.1.20191224:0= python_targets_pypy3? ( >=dev-pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20191224.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.1.20191224.tar.gz.sig )
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	4069de8c442b579579eb63348d72683f
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	f2f84a35f167f86e5da84a2a2f4f7d65
 _md5_=6a2912e0ef3ff11f066cecabdce1d425
diff --git a/metadata/md5-cache/dev-python/mpdlcd-0.5.2 b/metadata/md5-cache/dev-python/mpdlcd-0.5.2
index 3dabf59db254..aea8254cc4c1 100644
--- a/metadata/md5-cache/dev-python/mpdlcd-0.5.2
+++ b/metadata/md5-cache/dev-python/mpdlcd-0.5.2
@@ -4,7 +4,7 @@ DESCRIPTION=A small tool to display the MPD status on a LCDproc server.
 EAPI=7
 HOMEPAGE=https://github.com/rbarrois/mpdlcd
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/python-mpd python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rbarrois/mpdlcd/archive/mpdlcd-0.5.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e68919eb09b9bf66d5224bee25f82fa3
+_md5_=303b86e797a087496a0963e7e9667969
diff --git a/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10 b/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10
deleted file mode 100644
index fe643a7636c1..000000000000
--- a/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Commonly needed Python modules used by Python software developed at OSRF
-EAPI=7
-HOMEPAGE=https://github.com/osrf/osrf_pycommon
-IUSE=test test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/osrf/osrf_pycommon/archive/0.1.10.tar.gz -> osrf_pycommon-0.1.10.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aceb15740b42c3b12a79dd2b7bf2916a
diff --git a/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1 b/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
new file mode 100644
index 000000000000..21d83b9b5cbb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/osrf_pycommon-0.1.10-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Commonly needed Python modules used by Python software developed at OSRF
+EAPI=7
+HOMEPAGE=https://github.com/osrf/osrf_pycommon
+IUSE=test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/osrf/osrf_pycommon/archive/0.1.10.tar.gz -> osrf_pycommon-0.1.10.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=815a033323b9260f6ecdad834a55896c
diff --git a/metadata/md5-cache/dev-python/paste-3.4.4 b/metadata/md5-cache/dev-python/paste-3.4.4
index 416fb0be65b9..f6e27fe512b5 100644
--- a/metadata/md5-cache/dev-python/paste-3.4.4
+++ b/metadata/md5-cache/dev-python/paste-3.4.4
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for using a Web Server Gateway Interface stack
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Paste/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-3.4.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=064f1b6a84183d8dd17467191e781748
+_md5_=a34fa674ffd26efd92640d9c8195f77c
diff --git a/metadata/md5-cache/dev-python/pgspecial-1.11.9 b/metadata/md5-cache/dev-python/pgspecial-1.11.9
index 92e52530432b..b91faebe5038 100644
--- a/metadata/md5-cache/dev-python/pgspecial-1.11.9
+++ b/metadata/md5-cache/dev-python/pgspecial-1.11.9
@@ -4,7 +4,7 @@ DESCRIPTION=Python implementation of postgres meta commands
 EAPI=7
 HOMEPAGE=https://github.com/dbcli/pgspecial
 IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.7.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlparse-0.1.19[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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgspecial/archive/v1.11.9.tar.gz -> pgspecial-1.11.9.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7b8bef1497a7f6e0945e4ca4e89ffbf4
+_md5_=0e10975a55b7fd51a53b3ffaee46f860
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.9 b/metadata/md5-cache/dev-python/phonenumbers-8.12.9
index 7ba12566730d..4ebfd9025f9d 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.12.9
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.9
@@ -4,11 +4,11 @@ DESCRIPTION=Python port of Google's libphonenumber
 EAPI=7
 HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.9.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=82a94cf3e0ff7cc68cb4b10dcbda2dd0
+_md5_=c45db5a5eb55f31b32afb9c8b02ab157
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.73-r2 b/metadata/md5-cache/dev-python/pycups-1.9.73-r2
index 6ced9fee25ab..df006f8d864c 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.73-r2
+++ b/metadata/md5-cache/dev-python/pycups-1.9.73-r2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=net-print/cups
 DESCRIPTION=Python bindings for the CUPS API
 EAPI=7
 HOMEPAGE=http://cyberelk.net/tim/data/pycups/
-IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=net-print/cups python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=net-print/cups python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycups/pycups-1.9.73.tar.bz2
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=79d882187c2deed5e142661bb1877a0b
+_md5_=bde64d3bc81f5d094b5da68c283fea10
diff --git a/metadata/md5-cache/dev-python/pyfakefs-4.1.0 b/metadata/md5-cache/dev-python/pyfakefs-4.1.0
index 3b6351a1b217..80814dfec7d7 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-4.1.0
+++ b/metadata/md5-cache/dev-python/pyfakefs-4.1.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfake
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v4.1.0.tar.gz -> pyfakefs-4.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f7ebb4031918da2646a73a0a53373bee
+_md5_=e3221fc7305251663ff029bc82746dd4
diff --git a/metadata/md5-cache/dev-python/pylint-2.6.0 b/metadata/md5-cache/dev-python/pylint-2.6.0
new file mode 100644
index 000000000000..b01aaeeee15a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylint-2.6.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/sphinx ) test? ( >=dev-python/astroid-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <=dev-python/astroid-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/isort-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/toml-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python code static checker
+EAPI=7
+HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint
+IUSE=examples doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/astroid-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <=dev-python/astroid-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/isort-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mccabe-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/toml-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pylint/pylint-2.6.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=61b65006bb29149c32ca41a82a30e196
diff --git a/metadata/md5-cache/dev-python/pymilter-1.0.4-r1 b/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
index e92b5ec8419c..23a55aaf1c7b 100644
--- a/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
+++ b/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Python interface to sendmail milter API
 EAPI=7
 HOMEPAGE=https://github.com/sdgathman/pymilter
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) test? ( python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sdgathman/pymilter/archive/pymilter-1.0.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=88a445f1676bc3e8b1cfe020fb5ea918
+_md5_=a093e15470f0c72f0c8acb1b0018c1b7
diff --git a/metadata/md5-cache/dev-python/pytest-pylint-0.17.0 b/metadata/md5-cache/dev-python/pytest-pylint-0.17.0
new file mode 100644
index 000000000000..1593f13a99e5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-pylint-0.17.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pylint-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-5.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/toml-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=pytest plugin to check source code with pylint
+EAPI=7
+HOMEPAGE=https://github.com/carsongee/pytest-pylint
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pylint-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-5.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/toml-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/carsongee/pytest-pylint/archive/0.17.0.tar.gz -> pytest-pylint-0.17.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a660a3864e73f014f3c3791959a39a7c
diff --git a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0 b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0
index befc1481a481..53921f6ebe46 100644
--- a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0
+++ b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Python 2 and 3 asynchronous JSON RPC server
 EAPI=7
 HOMEPAGE=https://github.com/palantir/python-jsonrpc-server
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=~dev-python/ujson-1.35[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-jsonrpc-server/python-jsonrpc-server-0.4.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ec42a4ee7659e48f341d9ffa104ec5d
+_md5_=8b153399c2bf73e41a4446b05e82b6f3
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.35.1 b/metadata/md5-cache/dev-python/python-language-server-0.35.1
index 9d706b71bff6..b9edfc1e05f3 100644
--- a/metadata/md5-cache/dev-python/python-language-server-0.35.1
+++ b/metadata/md5-cache/dev-python/python-language-server-0.35.1
@@ -4,7 +4,7 @@ DESCRIPTION=An implementation of the Language Server Protocol for Python
 EAPI=7
 HOMEPAGE=https://github.com/palantir/python-language-server
 IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jedi-0.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/jedi-0.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pluggy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-jsonrpc-server-0.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-python/ujson-1.35[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.35.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9da0e51b4152fd2a291de1571b0333db
+_md5_=a517a470a5707a6b49ba9ff9cfadcd93
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1 b/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
index dd98523feabc..7a9d98cf8967 100644
--- a/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
+++ b/metadata/md5-cache/dev-python/python_orocos_kdl-1.4.0-r1
@@ -1,14 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Python bindings for KDL
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.orocos.org/kdl
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.4.0.tar.gz -> orocos_kinematics_dynamics-1.4.0.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4536cc0a7be0f78c686e291b3307c21
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=32be31c2db1c1d057309cbaf31a6da41
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-9999 b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
index 3d1441f82962..09cb183c092a 100644
--- a/metadata/md5-cache/dev-python/python_orocos_kdl-9999
+++ b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
@@ -1,13 +1,14 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Python bindings for KDL
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.orocos.org/kdl
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60226f85a8b4b5917080a7c4e7c29b05
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9793916fab8d993be34f6a21cb67af4e
diff --git a/metadata/md5-cache/dev-python/rencode-1.0.6 b/metadata/md5-cache/dev-python/rencode-1.0.6
index e2efe2783943..efdf1e43a81b 100644
--- a/metadata/md5-cache/dev-python/rencode-1.0.6
+++ b/metadata/md5-cache/dev-python/rencode-1.0.6
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=similar to bencode from the BitTorrent project
 EAPI=7
 HOMEPAGE=https://github.com/aresch/rencode
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/aresch/rencode/archive/v1.0.6.tar.gz -> rencode-1.0.6.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f273397b50f4bab06b1af20b775c56e
+_md5_=868987e182aa73da9616e12774aa7f5d
diff --git a/metadata/md5-cache/dev-python/rope-0.17.0 b/metadata/md5-cache/dev-python/rope-0.17.0
index e8880cca7c33..b76fda7e7fca 100644
--- a/metadata/md5-cache/dev-python/rope-0.17.0
+++ b/metadata/md5-cache/dev-python/rope-0.17.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python refactoring library
 EAPI=7
 HOMEPAGE=https://github.com/python-rope/rope
 IUSE=doc test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rope/rope-0.17.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=df6a8d8697e6d2657a6c84be614c224d
+_md5_=a8c853f7f6c94a465e9605244c7cc23c
diff --git a/metadata/md5-cache/dev-python/rospkg-1.2.8 b/metadata/md5-cache/dev-python/rospkg-1.2.8
deleted file mode 100644
index 28a935e80d30..000000000000
--- a/metadata/md5-cache/dev-python/rospkg-1.2.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Standalone Python library for the ROS package system
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rospkg
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.2.8.tar.gz -> rospkg-1.2.8.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=40daaeb976f300cd56475cbf397e70de
diff --git a/metadata/md5-cache/dev-python/rospkg-1.2.8-r1 b/metadata/md5-cache/dev-python/rospkg-1.2.8-r1
new file mode 100644
index 000000000000..24ced60ee001
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rospkg-1.2.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Standalone Python library for the ROS package system
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rospkg
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.2.8.tar.gz -> rospkg-1.2.8.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c082ad3ecb5e83e6dd7eec19a8fa174f
diff --git a/metadata/md5-cache/dev-python/rospkg-9999 b/metadata/md5-cache/dev-python/rospkg-9999
index 68e6f8e86ab5..6b2f97f5b4e4 100644
--- a/metadata/md5-cache/dev-python/rospkg-9999
+++ b/metadata/md5-cache/dev-python/rospkg-9999
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Standalone Python library for the ROS package system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospkg
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=40daaeb976f300cd56475cbf397e70de
+_md5_=c082ad3ecb5e83e6dd7eec19a8fa174f
diff --git a/metadata/md5-cache/dev-python/routes-2.5.1 b/metadata/md5-cache/dev-python/routes-2.5.1
new file mode 100644
index 000000000000..68d27bf82caf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/routes-2.5.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/webob[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/repoze-lru-0.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A re-implementation of Rails routes system, mapping URLs to Controllers/Actions
+EAPI=7
+HOMEPAGE=https://routes.readthedocs.io/en/latest/ https://pypi.org/project/Routes/
+IUSE=doc test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/repoze-lru-0.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/R/Routes/Routes-2.5.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8ccee8b4ee2822e3ff7c7f2b8710cd90
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-0.19.0 b/metadata/md5-cache/dev-python/sentry-sdk-0.19.0
new file mode 100644
index 000000000000..345d6d3eb629
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sentry-sdk-0.19.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/asttokens[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/dnspython-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/executing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/eventlet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/fakeredis[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-login[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/gevent[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-aiohttp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-localserver[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/aiocontextvars[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/contextvars[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) test? ( dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python client for Sentry
+EAPI=7
+HOMEPAGE=https://getsentry.com https://pypi.org/project/sentry-sdk/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/getsentry/sentry-python/archive/0.19.0.tar.gz -> sentry-sdk-0.19.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3babb363e916a0999f8a4e4864386872
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.17 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
index 903c2194d01b..02924a5ab5c6 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
@@ -1,9 +1,9 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9[sqlite?] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite?] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite?] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite?] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0[sqlite?] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
-IUSE=examples +sqlite test test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.17.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ea66a2ce9e9ab92fac3d40fad5dbf3c
+_md5_=8181b05225c4a18a9d3997191d3938ea
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.0 b/metadata/md5-cache/dev-python/statsmodels-0.12.0
index bd0a37661429..c2a42a194081 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.12.0
+++ b/metadata/md5-cache/dev-python/statsmodels-0.12.0
@@ -4,7 +4,7 @@ DESCRIPTION=Statistical computations and models for use with SciPy
 EAPI=7
 HOMEPAGE=https://www.statsmodels.org/stable/index.html
 IUSE=examples doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/numpy-1.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c84ee500fdb209c552d9943363220679
+_md5_=d3e259ef0d94dd583b41e2f5e3b0df3b
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.14.2 b/metadata/md5-cache/dev-python/testfixtures-6.14.2
index f39fccc9ecb4..e5e1ac6297ca 100644
--- a/metadata/md5-cache/dev-python/testfixtures-6.14.2
+++ b/metadata/md5-cache/dev-python/testfixtures-6.14.2
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of helpers and mock objects for unit tests and doc test
 EAPI=7
 HOMEPAGE=https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testfixtures/testfixtures-6.14.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=44d00e79dbbc240ece7562e3a3ec1906
+_md5_=da682916ae41d0507601083d9b1d1597
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.1 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.1
deleted file mode 100644
index 986a3fccd630..000000000000
--- a/metadata/md5-cache/dev-python/tikzplotlib-0.9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/mock[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/mock[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pandas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
-EAPI=7
-HOMEPAGE=https://github.com/nschloe/tikzplotlib
-IUSE=test doc python_targets_python3_6 python_targets_python3_7 test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pillow[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 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nschloe/tikzplotlib/archive/v0.9.1.tar.gz -> tikzplotlib-0.9.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f104a3a3d09a11bb943656eea302fe4d
diff --git a/metadata/md5-cache/dev-python/tikzplotlib-0.9.4 b/metadata/md5-cache/dev-python/tikzplotlib-0.9.4
new file mode 100644
index 000000000000..0bb72fbd9538
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tikzplotlib-0.9.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/wheel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/exdown[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( app-text/texlive[extra] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/matplotlib[latex,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/mock[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/mock[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/mock[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Convert matplotlib figures into TikZ/PGFPlots
+EAPI=7
+HOMEPAGE=https://github.com/nschloe/tikzplotlib
+IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/texlive[extra] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/matplotlib[latex,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nschloe/tikzplotlib/archive/v0.9.4.tar.gz -> tikzplotlib-0.9.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=49b5c9296a7d965df35c4103ad54dffa
diff --git a/metadata/md5-cache/dev-python/ujson-1.35-r1 b/metadata/md5-cache/dev-python/ujson-1.35-r1
index 3df3b842260c..cc564e9b056e 100644
--- a/metadata/md5-cache/dev-python/ujson-1.35-r1
+++ b/metadata/md5-cache/dev-python/ujson-1.35-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Ultra fast JSON encoder and decoder for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ujson/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-1.35.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1e83f67ef6fc603c252317d6a50a5a95
+_md5_=22ba480147a8326559e9f7c2a7a02b7c
diff --git a/metadata/md5-cache/dev-python/ujson-3.2.0 b/metadata/md5-cache/dev-python/ujson-3.2.0
index 2f1f5c562472..9047d94b1006 100644
--- a/metadata/md5-cache/dev-python/ujson-3.2.0
+++ b/metadata/md5-cache/dev-python/ujson-3.2.0
@@ -5,7 +5,7 @@ DESCRIPTION=Ultra fast JSON encoder and decoder for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ujson/
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-3.2.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d13017e48deb0d7e4ed15d770e42169d
+_md5_=1f640584f62dad4d5f93d58e10052b13
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.7 b/metadata/md5-cache/dev-python/wxpython-4.0.7
index 2bc9142a482c..728137a4231e 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.7
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.7
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 app-doc/doxygen dev-python/pathlib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 app-doc/doxygen dev-python/pathlib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=A blending of the wxWindows C++ class library with Python
 EAPI=7
 HOMEPAGE=https://www.wxpython.org/
-IUSE=test webkit python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
+IUSE=test webkit python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
 KEYWORDS=~alpha ~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=wxWinLL-3
-RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=4.0
 SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.7.post2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=fa53d836204d95c635b6b9f00b7a2535
+_md5_=e2a08606fe6c9dfb2537a9088a9dd41c
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-1.3.7 b/metadata/md5-cache/dev-python/xlsxwriter-1.3.7
new file mode 100644
index 000000000000..446a024b5d1f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xlsxwriter-1.3.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module for creating Excel XLSX files
+EAPI=7
+HOMEPAGE=https://github.com/jmcnamara/XlsxWriter
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_1.3.7.tar.gz -> xlsxwriter-1.3.7-tests.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3e851768c2abe357fd4b394d02351455
diff --git a/metadata/md5-cache/dev-python/yapf-0.30.0 b/metadata/md5-cache/dev-python/yapf-0.30.0
index 4398fcd69155..caa449d65f7b 100644
--- a/metadata/md5-cache/dev-python/yapf-0.30.0
+++ b/metadata/md5-cache/dev-python/yapf-0.30.0
@@ -4,11 +4,11 @@ DESCRIPTION=A formatter for Python files
 EAPI=7
 HOMEPAGE=https://github.com/google/yapf
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/google/yapf/archive/v0.30.0.tar.gz -> yapf-0.30.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3005750191f54afbed963192616e0ed1
+_md5_=9630e5242821fcad29517cad91c74948
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 761b2c45ea68..f5ea438f84f8 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.15.1 b/metadata/md5-cache/dev-qt/assistant-5.15.1
index 3d4670d404c0..5d8c6306a68b 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.15.1
+++ b/metadata/md5-cache/dev-qt/assistant-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=webkit 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.15.1:5= ~dev-qt/qtgui-5.15.1 ~dev-qt/qthelp-5.15.1 ~dev-qt/qtnetwork-5.15.1 ~dev-qt/qtprintsupport-5.15.1 ~dev-qt/qtsql-5.15.1[sqlite] ~dev-qt/qtwidgets-5.15.1 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=125c4b1b99b802c203c70f9dd2580aa5
+_md5_=24b709e00aa285aba91b5e557857da66
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.1 b/metadata/md5-cache/dev-qt/designer-5.15.1
index 74eab41d5817..9df21e31a7b9 100644
--- a/metadata/md5-cache/dev-qt/designer-5.15.1
+++ b/metadata/md5-cache/dev-qt/designer-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=WYSIWYG tool for designing and building graphical user interfaces wi
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=declarative webkit 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.15.1:5= ~dev-qt/qtgui-5.15.1:5= ~dev-qt/qtnetwork-5.15.1 ~dev-qt/qtprintsupport-5.15.1 ~dev-qt/qtwidgets-5.15.1 ~dev-qt/qtxml-5.15.1 declarative? ( ~dev-qt/qtdeclarative-5.15.1[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07bc7e8a6fbe2d505eae9c60e2ff82cc
+_md5_=224426b421d8d2fbe3148a31db4873f4
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.1 b/metadata/md5-cache/dev-qt/linguist-5.15.1
index d288886c6d5f..ed582cea1ab9 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.15.1
+++ b/metadata/md5-cache/dev-qt/linguist-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/designer-5.15.1 ~dev-qt/qtcore-5.15.1:5= ~dev-qt/qtgui-5.15.1:5= ~dev-qt/qtprintsupport-5.15.1 ~dev-qt/qtwidgets-5.15.1 ~dev-qt/qtxml-5.15.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1dceac3e40aeeab392435787d9d272d4
+_md5_=827e21b693048b5ee334842c5f0c9c03
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.1 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.1
index 2b3aaddc4fb3..6eb82f3ec125 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.1
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Tools for working with Qt translation data files
 EAPI=7
 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.15.1:5= ~dev-qt/qtxml-5.15.1 qml? ( ~dev-qt/qtdeclarative-5.15.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6c893852adc76c35eaea2198b5d41850
+_md5_=65dce5395bc376dc2b41ccbd32aa2fb2
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.1 b/metadata/md5-cache/dev-qt/pixeltool-5.15.1
index 7add44768065..6dd1109533c5 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.1
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Qt screen magnifier
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=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.15.1:5= ~dev-qt/qtgui-5.15.1:5= ~dev-qt/qtwidgets-5.15.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4b1fafcadda9df979aff2cac4d8e9840
+_md5_=794df6c10cb33b0a5165603503159dda
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.1 b/metadata/md5-cache/dev-qt/qdbus-5.15.1
index c27ea335e5c6..dff04bfc8f56 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.1
+++ b/metadata/md5-cache/dev-qt/qdbus-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Interface to Qt applications communicating over D-Bus
 EAPI=7
 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.15.1 ~dev-qt/qtdbus-5.15.1 ~dev-qt/qtxml-5.15.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=34f6891b1e615633d3b4f0da40f73cb0
+_md5_=17d973702e433947f0ed46d7540e5cc0
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.1 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.1
index 3015b39f8da1..b918ce12cc91 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.1
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=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.15.1 ~dev-qt/qtdbus-5.15.1 ~dev-qt/qtgui-5.15.1 ~dev-qt/qtwidgets-5.15.1 ~dev-qt/qtxml-5.15.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f63389f67c63da553c898905e51a4390
+_md5_=3e50c10d22987dd34512271a1f16a779
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.1
index d739f6fa5767..471cdf879c3a 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=7
 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.15.1:5= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e00ae2537ecb77dcea886bfb79f6e5c
+_md5_=2f3189413cc8ec8367580f03b9afb2ff
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.1 b/metadata/md5-cache/dev-qt/qtcore-5.15.1
deleted file mode 100644
index 0e7557ceafe7..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=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:= ) test? ( ~dev-qt/qttest-5.15.1 )
-DESCRIPTION=Cross-platform application development framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=icu old-kernel systemd kernel_linux debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-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.15.1
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd1f43c122811b3c77f9b08c4f2ce136
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.1-r1 b/metadata/md5-cache/dev-qt/qtcore-5.15.1-r1
index 89a98f4cf567..1d3106563fd1 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.1-r1
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.1-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=icu old-kernel systemd kernel_linux 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-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.15.1
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9fbcace6518e12e1232f36a64fafb22e
+_md5_=29deb93c2f0b18db0090bfd316895cf4
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.1 b/metadata/md5-cache/dev-qt/qtdbus-5.15.1
index df6af2839c4a..dcfabf5ded9e 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
 EAPI=7
 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.15.1:5= >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09322a67c27c77cc66c364c3f759e16f
+_md5_=bbf7ee47a9027d975608d33160bc8c21
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.1
index 0fa7f06c1883..b22046ae4878 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=The QML and Quick modules for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2-only +jit localstorage vulkan +widgets 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.15.1 ~dev-qt/qtgui-5.15.1:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.15.1 ~dev-qt/qttest-5.15.1 localstorage? ( ~dev-qt/qtsql-5.15.1 ) widgets? ( ~dev-qt/qtwidgets-5.15.1[gles2-only=] ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtdeclarative-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a34ffc5c9c3382ad93dfcd1712bc33b9
+_md5_=313e3b4bc5d74ad2977e5eb94e9b8f17
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.1
index 5cb26859208f..299c2bf53c2a 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Set of QML types for adding visual effects to user interfaces
 EAPI=7
 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.15.1 ~dev-qt/qtdeclarative-5.15.1 ~dev-qt/qtgui-5.15.1 dev-qt/qtchooser
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtgraphicaleffects-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1136d911ee5b561a8828a67522a9dabb
+_md5_=356196b0704577fac50950105b2773a6
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.1-r1 b/metadata/md5-cache/dev-qt/qtgui-5.15.1-r1
index 241ab9f0c750..9a67248b9e48 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.1-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput +png tslib tuio +udev vnc vulkan wayland +X 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=ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-5.15.1 )
 RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.15.1:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= dbus? ( ~dev-qt/qtdbus-5.15.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.15.1 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.1 ) vulkan? ( dev-util/vulkan-headers ) X? ( 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
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15.1
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=19ae751960edbdd1fc773257f039518c
+_md5_=4f6e2712bbfc11df650637e1b6a58130
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.1 b/metadata/md5-cache/dev-qt/qthelp-5.15.1
index 4d7efee1a3e1..49c8b484ff04 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.1
+++ b/metadata/md5-cache/dev-qt/qthelp-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5 module for integrating online documentation into applications
 EAPI=7
 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.15.1:5= ~dev-qt/qtgui-5.15.1 ~dev-qt/qtnetwork-5.15.1 ~dev-qt/qtsql-5.15.1[sqlite] ~dev-qt/qtwidgets-5.15.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e78dde221ce970fa047ec726e2c0698
+_md5_=9e89c35384c0513a6ba9587b10212394
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.1 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.1
index a53fe3d2e89c..f6b77aa46380 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=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.15.1 ~dev-qt/qtgui-5.15.1 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtimageformats-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ac5d51a747fa7e3c540f29da2354d973
+_md5_=66babb13a773f0bd6f6f18a02b8ce8b8
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.1
index 3517bfe0eeaf..20be4b1a2cb3 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framewo
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa gles2-only gstreamer openal pulseaudio qml widgets 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.15.1 ~dev-qt/qtgui-5.15.1[gles2-only=] ~dev-qt/qtnetwork-5.15.1 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.15.1 gles2-only? ( ~dev-qt/qtgui-5.15.1[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.15.1 ~dev-qt/qtwidgets-5.15.1[gles2-only=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtmultimedia-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7683dc0f9fd8ba453e77ed6140607470
+_md5_=03f610a7e96ab0ae77119df0473b5f4b
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.1 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.1
index 19fed6716ace..0d19e7f2c5ad 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Network abstraction library for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=bindist connman gssapi libressl libproxy networkmanager sctp +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.15.1:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.15.1 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.15.1 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cc1172c59e2cc9465d5dcbec6a323149
+_md5_=db34304d8b855b99a285c707ac128487
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.1 b/metadata/md5-cache/dev-qt/qtopengl-5.15.1
index afd069967ef7..77c28b47e145 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2-only test 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.15.1:5= ~dev-qt/qtgui-5.15.1[gles2-only=] ~dev-qt/qtwidgets-5.15.1[gles2-only=] !gles2-only? ( virtual/opengl ) dev-qt/qtchooser
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e87c518935f7262804cd7a047f8af449
+_md5_=73841c4f8c73549e6503e5a3e5f88e39
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.1 b/metadata/md5-cache/dev-qt/qtpaths-5.15.1
index 7c634ddf4b19..e72f61a2d060 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Command line client to QStandardPaths
 EAPI=7
 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.15.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=95beb0e49ca5868c7c49ca63dd509672
+_md5_=11d8e9f5b113b381a9b6dcedc4b574e8
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.1 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.1
index a03d742e500f..4781f25a02d2 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.15.1
@@ -5,7 +5,7 @@ DESCRIPTION=Physical position determination library for the Qt5 framework
 EAPI=7
 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.15.1 geoclue? ( ~dev-qt/qtdbus-5.15.1 ) qml? ( ~dev-qt/qtdeclarative-5.15.1 ) dev-qt/qtchooser
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtlocation-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a079cd035792db81535262c0ffb4127
+_md5_=2e7758efe247d5798c7baafc81920221
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.1
index 9e3f0bda0462..a7e4fdc83f7d 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Printing support library for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=cups gles2-only test 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.15.1:5= ~dev-qt/qtgui-5.15.1[gles2-only=] ~dev-qt/qtwidgets-5.15.1[gles2-only=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c251dba42a47678a1df8af7936be9e63
+_md5_=fd36324a300e6b6bb8d8dccf969f64cd
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.1
index 9bc3c3722bd7..b064468c0538 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Set of Qt Quick controls to create complete user interfaces (depreca
 EAPI=7
 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.15.1 ~dev-qt/qtdeclarative-5.15.1 ~dev-qt/qtgui-5.15.1 widgets? ( ~dev-qt/qtwidgets-5.15.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtquickcontrols-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c81bd20beead6fe15394f4fab927f9bf
+_md5_=a721622fe6915f81d538e46bd97f26dd
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.1 b/metadata/md5-cache/dev-qt/qtscript-5.15.1
index 2ef7f9efafcd..0a517c522f04 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtscript-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=+jit scripttools 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.15.1 scripttools? ( ~dev-qt/qtgui-5.15.1 ~dev-qt/qtwidgets-5.15.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtscript-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f3a5f0e38bc18b639f7ecb8dce4b88f4
+_md5_=47d633a7fb85291be036abff4e43318b
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.1 b/metadata/md5-cache/dev-qt/qtsensors-5.15.1
index 665e50635ad6..9f1af4e4c8ff 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Hardware sensor access library for the Qt5 framework
 EAPI=7
 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.15.1 ~dev-qt/qtdbus-5.15.1 qml? ( ~dev-qt/qtdeclarative-5.15.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtsensors-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bcbf8f1138f323d8addda3e1cca0e2f5
+_md5_=fd85007106050b9cdc525274c2a9d5ce
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.1 b/metadata/md5-cache/dev-qt/qtserialport-5.15.1
index 69282336aff6..bbf3bb19e3c1 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=7
 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.15.1 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtserialport-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4366240450c374076d571678defc7899
+_md5_=abd8dc1324d9c6ca5616c06bef3ff36c
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.1 b/metadata/md5-cache/dev-qt/qtsql-5.15.1
index 427f55b25b71..0a9fa0ec369f 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.1
@@ -5,7 +5,7 @@ DESCRIPTION=SQL abstraction library for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=freetds mysql oci8 odbc postgres +sqlite 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.15.1:5= 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 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.15.1
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b35216078d0b166ad08c067bdcad8649
+_md5_=54da2f236ef7b573ab2b2ba9f9046130
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.1 b/metadata/md5-cache/dev-qt/qtsvg-5.15.1
index 31b227a8c999..af00766781ec 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=SVG rendering library for the Qt5 framework
 EAPI=7
 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.15.1 ~dev-qt/qtgui-5.15.1 ~dev-qt/qtwidgets-5.15.1 sys-libs/zlib:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtsvg-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a57cdda63f5e11b79e5f08357bf60906
+_md5_=79360f2c16cf608a349468039d10a789
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.1 b/metadata/md5-cache/dev-qt/qttest-5.15.1
index d8cf13e03f8d..bcb3e8ed422f 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.15.1
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Unit testing library for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=test 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.15.1:5= dev-qt/qtchooser
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=58e606ba27abf364a6eda3d083aaf355
+_md5_=feca0e51208e90774395fbe53a0f0dff
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.1 b/metadata/md5-cache/dev-qt/qttranslations-5.15.1
index 6eaedf4cd36d..b024c5386151 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.1
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Translation files for the Qt5 framework
 EAPI=7
 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/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttranslations-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85d9eca5f65033c7bd97e61639737f41
+_md5_=9dc4179b45e5f93b3f08938c403bf1fa
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.1 b/metadata/md5-cache/dev-qt/qtwayland-5.15.1
index d97374ca0eac..a13606dac6af 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Wayland platform plugin for Qt
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=vulkan X 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-libs/wayland-1.6.0 ~dev-qt/qtcore-5.15.1 ~dev-qt/qtdeclarative-5.15.1 ~dev-qt/qtgui-5.15.1[egl,libinput,vulkan=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( ~dev-qt/qtgui-5.15.1[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwayland-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c65109830d553c60786a3c7bdc9d61ac
+_md5_=40fb95f9978ff536af329b059b8b0b6b
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.1 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.1
index b2d5f266167f..044515e98bec 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaSc
 EAPI=7
 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.15.1 qml? ( ~dev-qt/qtdeclarative-5.15.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebchannel-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dfc46de5517836a23b7f70e80bb2f410
+_md5_=2861611652240a6d9a5108ec00842235
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.1 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.1
index af895c5e6410..80aef75e363a 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=7
 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.15.1 ~dev-qt/qtnetwork-5.15.1[ssl=] qml? ( ~dev-qt/qtdeclarative-5.15.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebsockets-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85416416c88e61121479043ce5f60047
+_md5_=ba4729ff4d3e162e53db3e137bdfda13
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.1 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.1
index 0d6293071072..bc4abcbba25f 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2-only gtk +png +X 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.15.1:5= ~dev-qt/qtgui-5.15.1[gles2-only=,png=,X?] gtk? ( ~dev-qt/qtgui-5.15.1[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=77ac0ae9fc6d59b3daaa5f84354f641e
+_md5_=22137fcfe4f760c6c78f1d7b43547997
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.1 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.1
index 90e0b525de3f..26d2b9b7f91d 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
 EAPI=7
 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.15.1 ~dev-qt/qtgui-5.15.1[X] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtx11extras-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d054a88e9ea8b27a2197a0890b2c26cd
+_md5_=f8f356e425465fda3feb1b7de8c46412
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.1 b/metadata/md5-cache/dev-qt/qtxml-5.15.1
index 11b915a66d11..e1eaee02d153 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
 EAPI=7
 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.15.1:5= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ad4db416df01ab17adf4fe8999109e59
+_md5_=fd38c35aeaa33583564c7e274af2a8da
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.1
index f726b6757c0c..7c1c58046c8e 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.1
@@ -5,11 +5,11 @@ DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 f
 EAPI=7
 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.15.1 ~dev-qt/qtnetwork-5.15.1 qml? ( ~dev-qt/qtdeclarative-5.15.1 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtxmlpatterns-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=88e8278eb0e1a133381466308ee51449
+_md5_=e1c116505509882fb4acc5013ed69dd9
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index ff219100efe1..9322cb460ccb 100644
Binary files a/metadata/md5-cache/dev-ros/Manifest.gz and b/metadata/md5-cache/dev-ros/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.1 b/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.2
similarity index 96%
rename from metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.1
rename to metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.2
index 2bb66fdf0e99..4095c613f0b3 100644
--- a/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.1
+++ b/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.2
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 BSD
 RDEPEND=>=dev-libs/console_bridge-1.0.1
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros2/console_bridge_vendor/archive/1.2.1.tar.gz -> console_bridge_vendor-1.2.1.tar.gz
+SRC_URI=https://github.com/ros2/console_bridge_vendor/archive/1.2.2.tar.gz -> console_bridge_vendor-1.2.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e3cfb93af19da0c73a2cea29521013f
diff --git a/metadata/md5-cache/dev-ros/filters-1.9.0 b/metadata/md5-cache/dev-ros/filters-1.9.1
similarity index 96%
rename from metadata/md5-cache/dev-ros/filters-1.9.0
rename to metadata/md5-cache/dev-ros/filters-1.9.1
index 9b1a27390f8a..fbb4d578d6d7 100644
--- a/metadata/md5-cache/dev-ros/filters-1.9.0
+++ b/metadata/md5-cache/dev-ros/filters-1.9.1
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-r
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros/filters/archive/1.9.0.tar.gz -> filters-1.9.0.tar.gz
+SRC_URI=https://github.com/ros/filters/archive/1.9.1.tar.gz -> filters-1.9.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20027b0f1e30d6b0edb94721f9dab0ac
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0 b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2
similarity index 98%
rename from metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
rename to metadata/md5-cache/dev-ros/geometric_shapes-0.7.2
index 487a0047626e..bd52290481e5 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.2
@@ -11,6 +11,6 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.7.0.tar.gz -> geometric_shapes-0.7.0.tar.gz
+SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.7.2.tar.gz -> geometric_shapes-0.7.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66a149403d3e3f7e4fa39dee81a14a77
diff --git a/metadata/md5-cache/dev-ros/libmavconn-1.4.0 b/metadata/md5-cache/dev-ros/libmavconn-1.4.0
new file mode 100644
index 000000000000..ee90377a5f86
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/libmavconn-1.4.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
+DESCRIPTION=MAVLink communication library
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.4.0.tar.gz -> mavros-1.4.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4ffc733eb9f883c4dd3f64af83418ea5
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7-r1 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.9.10
similarity index 96%
rename from metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7-r1
rename to metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.9.10
index 29ad72ba2d9f..d146bca6e003 100644
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7-r1
+++ b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.9.10
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_7? ( dev-python/future[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/noetic/mavlink/2020.7.7-2020.7.7.tar.gz -> mavlink-gbp-release-2020.7.7.tar.gz
+SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/noetic/mavlink/2020.9.10-2020.9.10.tar.gz -> mavlink-gbp-release-2020.9.10.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aaa5240aa2874d27cc1890ee7da112f6
diff --git a/metadata/md5-cache/dev-ros/mavros-1.4.0 b/metadata/md5-cache/dev-ros/mavros-1.4.0
new file mode 100644
index 000000000000..7f7133ea45f2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros-1.4.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.4.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
+DESCRIPTION=MAVLink extendable communication node for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.4.0.tar.gz -> mavros-1.4.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fb00de4bc210d67dd2402b4312493b38
diff --git a/metadata/md5-cache/dev-ros/mavros-9999 b/metadata/md5-cache/dev-ros/mavros-9999
index 5700c6ed9f57..b7aae096dbde 100644
--- a/metadata/md5-cache/dev-ros/mavros-9999
+++ b/metadata/md5-cache/dev-ros/mavros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
 IUSE=python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-3 LGPL-3 BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions sci-geosciences/GeographicLib >=dev-ros/mavlink-gbp-release-2020.9.10 dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97a87f1d3c66eca22769bea745583b3a
+_md5_=fb00de4bc210d67dd2402b4312493b38
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-1.4.0 b/metadata/md5-cache/dev-ros/mavros_extras-1.4.0
new file mode 100644
index 000000000000..003e4e7adcef
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros_extras-1.4.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
+DESCRIPTION=Extra nodes and plugins for mavros
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.4.0.tar.gz -> mavros-1.4.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a32bca61b73d165ce652a5e91bb039c0
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-1.4.0 b/metadata/md5-cache/dev-ros/mavros_msgs-1.4.0
new file mode 100644
index 000000000000..cb4cddabb58e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-1.4.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+DESCRIPTION=Messages for MAVROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.4.0.tar.gz -> mavros-1.4.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9cfac3d5630d73dfc3489eb948345dcb
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1 b/metadata/md5-cache/dev-ros/moveit_msgs-0.11.1
similarity index 98%
rename from metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
rename to metadata/md5-cache/dev-ros/moveit_msgs-0.11.1
index 378c4b6eb263..7cf58ca8854a 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.11.1
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.10.1.tar.gz -> moveit_msgs-0.10.1.tar.gz
+SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.11.1.tar.gz -> moveit_msgs-0.11.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3ee98710b0c308b3a8bab2054f695e7
diff --git a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1 b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.2
similarity index 98%
rename from metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
rename to metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.2
index 1fe821150eb5..3d0853aa74e0 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.2
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/wg-perception/object_recognition_msgs/archive/0.4.1.tar.gz -> object_recognition_msgs-0.4.1.tar.gz
+SRC_URI=https://github.com/wg-perception/object_recognition_msgs/archive/0.4.2.tar.gz -> object_recognition_msgs-0.4.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35c97eba14e78a4aa5bb582f53d03f74
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1
deleted file mode 100644
index 427c3df80a3a..000000000000
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
-DESCRIPTION=C++-bindings for qt_gui and creates bindings for every generator available
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/qt_gui_cpp https://github.com/ros-visualization/qt_gui_core
-IUSE=python_single_target_python3_7 python_single_target_python3_8 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f1f8ada8f7c5835bc5919d6190b5235
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2-r1
similarity index 98%
rename from metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2
rename to metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2-r1
index 35a856468663..d0e1665bc65c 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2fc17b9ae540cf6395e7937bd73ccdb8
+_md5_=fad4e15b24e1444a0347549b09a3fb64
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
index bb7fdec7c053..9234fd2bd304 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2fc17b9ae540cf6395e7937bd73ccdb8
+_md5_=fad4e15b24e1444a0347549b09a3fb64
diff --git a/metadata/md5-cache/dev-ros/ros_environment-1.3.1 b/metadata/md5-cache/dev-ros/ros_environment-1.3.2
similarity index 95%
rename from metadata/md5-cache/dev-ros/ros_environment-1.3.1
rename to metadata/md5-cache/dev-ros/ros_environment-1.3.2
index 762dce850ac5..ab0830d64eec 100644
--- a/metadata/md5-cache/dev-ros/ros_environment-1.3.1
+++ b/metadata/md5-cache/dev-ros/ros_environment-1.3.2
@@ -11,6 +11,6 @@ RDEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_7? ( dev-lang/pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros/ros_environment/archive/1.3.1.tar.gz -> ros_environment-1.3.1.tar.gz
+SRC_URI=https://github.com/ros/ros_environment/archive/1.3.2.tar.gz -> ros_environment-1.3.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f1e9ed0b71fdc39497a11cbd2ca30f6
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.9.1
new file mode 100644
index 000000000000..71080436e265
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
+DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_arduino https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01f5d2e059145dbd4b8d5499257803a6
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_client-0.9.1
new file mode 100644
index 000000000000..b8f35ad1672a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
+DESCRIPTION=Generalized client side source for rosserial
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_client https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8b4d212504387ee1f1a43dcd1d19b12b
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.9.1
new file mode 100644
index 000000000000..eb8b0b126f14
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
+DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_embeddedlinux https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b29350ec3aa158b69276ec88ac695ed5
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.9.1
new file mode 100644
index 000000000000..dfd5f80a86f0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
+DESCRIPTION=Messages for automatic topic configuration using rosserial
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_msgs https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b9bd5c0e8043ab57691a0967eae88cd
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_python-0.9.1
new file mode 100644
index 000000000000..dd8b9cab8120
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
+DESCRIPTION=A Python-based implementation of the ROS serial protocol
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_python https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff762244924b198b89504337dd9f31d1
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_server-0.9.1
similarity index 93%
rename from metadata/md5-cache/dev-ros/rosserial_server-0.8.0
rename to metadata/md5-cache/dev-ros/rosserial_server-0.9.1
index 197613af1cb8..878fbf4ee1ca 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.9.1
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] python_sing
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5861d4f7fe56da0b0f0cafc6ebd7091b
+_md5_=1d8de4944216922cf488a1c60825f3fe
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-9999 b/metadata/md5-cache/dev-ros/rosserial_server-9999
index dbe71ce8cfbd..cd3c53543c74 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_server-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5861d4f7fe56da0b0f0cafc6ebd7091b
+_md5_=1d8de4944216922cf488a1c60825f3fe
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.9.1
new file mode 100644
index 000000000000..e133c49e0f6d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
+DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_tivac https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=243f73748f717611e78b9a861e0eb9b8
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_windows-0.9.1
new file mode 100644
index 000000000000..ba50f641d6fe
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
+DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_windows https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0dc0b18363be2339ae14a86ae36b428a
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.9.1 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.9.1
new file mode 100644
index 000000000000..8f06c56da631
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
+DESCRIPTION=Tools to do communicate between rosserial nodes connected to an xbee
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial_xbee https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1577863352a25b6cd0312f24233cd75
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.13 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.15
similarity index 98%
rename from metadata/md5-cache/dev-ros/rqt_bag-0.4.13
rename to metadata/md5-cache/dev-ros/rqt_bag-0.4.15
index 0f457e0d0bc5..3853855a2da8 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.13
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.15
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.13.tar.gz -> rqt_bag-0.4.13.tar.gz
+SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.15.tar.gz -> rqt_bag-0.4.15.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56be5be194b74b297c61f0d84be69fc2
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.15
similarity index 99%
rename from metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
rename to metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.15
index 5fa6b0532f05..3e808e705f5e 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.15
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.13.tar.gz -> rqt_bag-0.4.13.tar.gz
+SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.15.tar.gz -> rqt_bag-0.4.15.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efde050257d357297145beb708d3f729
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.15 b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.16
similarity index 98%
rename from metadata/md5-cache/dev-ros/rqt_image_view-0.4.15
rename to metadata/md5-cache/dev-ros/rqt_image_view-0.4.16
index d845a563db48..89760c6d8042 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.15
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.16
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?,python_single_targe
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_image_view/archive/0.4.15.tar.gz -> rqt_image_view-0.4.15.tar.gz
+SRC_URI=https://github.com/ros-visualization/rqt_image_view/archive/0.4.16.tar.gz -> rqt_image_view-0.4.16.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e1210d84a04b5573c35a9a8220aef47
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.8 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.9
similarity index 98%
rename from metadata/md5-cache/dev-ros/rqt_launch-0.4.8
rename to metadata/md5-cache/dev-ros/rqt_launch-0.4.9
index c1ea50a6921b..1a7403e68bf9 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.9
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?,python_single_t
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_launch/archive/0.4.8.tar.gz -> rqt_launch-0.4.8.tar.gz
+SRC_URI=https://github.com/ros-visualization/rqt_launch/archive/0.4.9.tar.gz -> rqt_launch-0.4.9.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efc22c56f04960580f0bce126eeb3b60
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.13
similarity index 98%
rename from metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12
rename to metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.13
index 313240452846..90d9e05dbc56 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.13
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_robot_monitor/archive/0.5.12.tar.gz -> rqt_robot_monitor-0.5.12.tar.gz
+SRC_URI=https://github.com/ros-visualization/rqt_robot_monitor/archive/0.5.13.tar.gz -> rqt_robot_monitor-0.5.13.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=959de8cb5b8de2f5820c9e8f2315c59c
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.2
similarity index 98%
rename from metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1
rename to metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.2
index 026f79a2523b..8e63f1efadb3 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.2
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-visualization/rqt_tf_tree/archive/0.6.1.tar.gz -> rqt_tf_tree-0.6.1.tar.gz
+SRC_URI=https://github.com/ros-visualization/rqt_tf_tree/archive/0.6.2.tar.gz -> rqt_tf_tree-0.6.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1641f4ed598644646fdb8f9bcf93630
diff --git a/metadata/md5-cache/dev-ros/urg_node-0.1.13 b/metadata/md5-cache/dev-ros/urg_node-0.1.14
similarity index 97%
rename from metadata/md5-cache/dev-ros/urg_node-0.1.13
rename to metadata/md5-cache/dev-ros/urg_node-0.1.14
index b44b0fe47eb8..f5d666b45c65 100644
--- a/metadata/md5-cache/dev-ros/urg_node-0.1.13
+++ b/metadata/md5-cache/dev-ros/urg_node-0.1.14
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_targe
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-drivers/urg_node/archive/0.1.13.tar.gz -> urg_node-0.1.13.tar.gz
+SRC_URI=https://github.com/ros-drivers/urg_node/archive/0.1.14.tar.gz -> urg_node-0.1.14.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d45d963661bf7a5c0155e5d7fc7f2fa
diff --git a/metadata/md5-cache/dev-ros/xacro-1.14.1 b/metadata/md5-cache/dev-ros/xacro-1.14.5
similarity index 96%
rename from metadata/md5-cache/dev-ros/xacro-1.14.1
rename to metadata/md5-cache/dev-ros/xacro-1.14.5
index 5af78afceec8..0bef818130a4 100644
--- a/metadata/md5-cache/dev-ros/xacro-1.14.1
+++ b/metadata/md5-cache/dev-ros/xacro-1.14.5
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/roslint[python_single_target_python3_7(-)?,python_single_target_
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros/xacro/archive/1.14.1.tar.gz -> xacro-1.14.1.tar.gz
+SRC_URI=https://github.com/ros/xacro/archive/1.14.5.tar.gz -> xacro-1.14.5.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=864fe4d3a403fd1489a8366372d84461
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 2fdd39719b36..8c0992382c04 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/parser-2.7.2.0-r1 b/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
index a61aa8bf670e..f0b3cd5a5154 100644
--- a/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/parser-2.7.2.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] dev-ruby/racc[ruby_targets_ruby25(-)] dev-ruby/cliver[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/racc[ruby_targets_ruby26(-)] dev-ruby/cliver[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/racc[ruby_targets_ruby27(-)] dev-ruby/cliver[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( =dev-util/ragel-6* ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=A production-ready Ruby parser written in pure Ruby
 EAPI=7
 HOMEPAGE=https://github.com/whitequark/parser
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whitequark/parser/archive/v2.7.2.0.tar.gz -> parser-2.7.2.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=727af2ed76d51b3d5226415b7cd6f650
+_md5_=125a921b1935e0156c47e0f2e44f75ed
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 5206cf108d03..da280a8d8789 100644
Binary files a/metadata/md5-cache/dev-tcltk/Manifest.gz and b/metadata/md5-cache/dev-tcltk/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
index b64b5913ce9a..26fb30b43a51 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
@@ -5,7 +5,7 @@ DESCRIPTION=The Snack Sound Toolkit (Tcl)
 EAPI=7
 HOMEPAGE=http://www.speech.kth.se/snack/
 IUSE=alsa examples python vorbis python_targets_python3_7 test
-KEYWORDS=~amd64 hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) vorbis? ( media-libs/libvorbis )
 REQUIRED_USE=|| ( python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=8683c276069019389b965762165fd08a
+_md5_=6712d8f3f2c922f6b2dab93dcd71fecb
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4b05208f2e4c..d76c0a82afd7 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/android-studio-3.5.3.0.191.6010548 b/metadata/md5-cache/dev-util/android-studio-3.5.3.0.191.6010548
deleted file mode 100644
index d5cf78965b6e..000000000000
--- a/metadata/md5-cache/dev-util/android-studio-3.5.3.0.191.6010548
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Android development environment based on IntelliJ IDEA
-EAPI=7
-HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
-IUSE=custom-jdk selinux elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.5.3.0/android-studio-ide-191.6010548-linux.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2bff9f1866089fd4d361cdeddc46a27c
diff --git a/metadata/md5-cache/dev-util/android-studio-3.6.0.21.192.6200805 b/metadata/md5-cache/dev-util/android-studio-3.6.0.21.192.6200805
deleted file mode 100644
index 5bb0accebc76..000000000000
--- a/metadata/md5-cache/dev-util/android-studio-3.6.0.21.192.6200805
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Android development environment based on IntelliJ IDEA
-EAPI=7
-HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
-IUSE=custom-jdk selinux elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.6.0.21/android-studio-ide-192.6200805-linux.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=856ea7412fefd7e2be6a8d0cad9b326e
diff --git a/metadata/md5-cache/dev-util/android-studio-3.6.1.0.192.6241897 b/metadata/md5-cache/dev-util/android-studio-3.6.1.0.192.6241897
deleted file mode 100644
index 71a46272efd2..000000000000
--- a/metadata/md5-cache/dev-util/android-studio-3.6.1.0.192.6241897
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Android development environment based on IntelliJ IDEA
-EAPI=7
-HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
-IUSE=custom-jdk selinux elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.6.1.0/android-studio-ide-192.6241897-linux.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=856ea7412fefd7e2be6a8d0cad9b326e
diff --git a/metadata/md5-cache/dev-util/android-studio-3.6.2.0.192.6308749 b/metadata/md5-cache/dev-util/android-studio-3.6.2.0.192.6308749
deleted file mode 100644
index 92d28b2057e5..000000000000
--- a/metadata/md5-cache/dev-util/android-studio-3.6.2.0.192.6308749
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Android development environment based on IntelliJ IDEA
-EAPI=7
-HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
-IUSE=custom-jdk selinux elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.6.2.0/android-studio-ide-192.6308749-linux.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=856ea7412fefd7e2be6a8d0cad9b326e
diff --git a/metadata/md5-cache/dev-util/android-studio-3.6.3.0.192.6392135 b/metadata/md5-cache/dev-util/android-studio-4.1.0.19.201.6858069
similarity index 93%
rename from metadata/md5-cache/dev-util/android-studio-3.6.3.0.192.6392135
rename to metadata/md5-cache/dev-util/android-studio-4.1.0.19.201.6858069
index d36b71755a54..086e8613ff9a 100644
--- a/metadata/md5-cache/dev-util/android-studio-3.6.3.0.192.6392135
+++ b/metadata/md5-cache/dev-util/android-studio-4.1.0.19.201.6858069
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/commons-logging:0 dev-java/log4j:0 >=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.6.3.0/android-studio-ide-192.6392135-linux.tar.gz
+SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/4.1.0.19/android-studio-ide-201.6858069-linux.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=856ea7412fefd7e2be6a8d0cad9b326e
diff --git a/metadata/md5-cache/dev-util/android-tools-9.0.0_p3 b/metadata/md5-cache/dev-util/android-tools-9.0.0_p3
deleted file mode 100644
index 47bf32b45077..000000000000
--- a/metadata/md5-cache/dev-util/android-tools-9.0.0_p3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib:= dev-libs/libpcre2:= virtual/libusb:1= dev-lang/go dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=Android platform tools (adb, fastboot, and mkbootimg)
-EAPI=6
-HOMEPAGE=https://android.googlesource.com/platform/system/core.git/
-IUSE=python python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm x86 ~x86-linux
-LICENSE=Apache-2.0 BSD-2
-RDEPEND=sys-libs/zlib:= dev-libs/libpcre2:= virtual/libusb:1= python? ( 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? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
-SLOT=0
-SRC_URI=https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> android-tools-9.0.0_r3-arch.tar.xz https://github.com/android/platform_system_core/archive/android-9.0.0_r3.tar.gz -> android-tools-9.0.0_r3-core.tar.gz https://github.com/google/boringssl/archive/45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz -> boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz mirror://gentoo/android-tools-9.0.0_r3-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-e2fsprogs.tar.xz mirror://gentoo/android-tools-9.0.0_r3-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-extras.tar.xz mirror://gentoo/android-tools-9.0.0_r3-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-selinux.tar.xz mirror://gentoo/android-tools-9.0.0_r3-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-f2fs-tools.tar.xz mirror://gentoo/android-tools-9.0.0_r3.ninja.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3.ninja.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d6a70673ab6a7006e59ddba2d77791c
diff --git a/metadata/md5-cache/dev-util/android-tools-9.0.0_p3-r1 b/metadata/md5-cache/dev-util/android-tools-9.0.0_p3-r1
index c26e41394405..c20e1810d9f9 100644
--- a/metadata/md5-cache/dev-util/android-tools-9.0.0_p3-r1
+++ b/metadata/md5-cache/dev-util/android-tools-9.0.0_p3-r1
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0 BSD-2
 RDEPEND=sys-libs/zlib:= dev-libs/libpcre2:= virtual/libusb:1= python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
-SRC_URI=https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> android-tools-9.0.0_r3-arch.tar.xz https://github.com/android/platform_system_core/archive/android-9.0.0_r3.tar.gz -> android-tools-9.0.0_r3-core.tar.gz https://github.com/google/boringssl/archive/45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz -> boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz mirror://gentoo/android-tools-9.0.0_r3-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-e2fsprogs.tar.xz mirror://gentoo/android-tools-9.0.0_r3-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-extras.tar.xz mirror://gentoo/android-tools-9.0.0_r3-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-selinux.tar.xz mirror://gentoo/android-tools-9.0.0_r3-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-f2fs-tools.tar.xz mirror://gentoo/android-tools-9.0.0_r3.ninja.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3.ninja.xz https://raw.githubusercontent.com/nmeum/android-tools/8a30dba5768304176fd78aaa131242f6b880f828/patches/core/0022-Use-glibc-s-gettid-when-using-glibc-2.30.patch -> android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz
+SRC_URI=https://github.com/archlinux/svntogit-community/archive/0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.gz -> android-tools-9.0.0_r3-arch.tar.gz https://github.com/android/platform_system_core/archive/android-9.0.0_r3.tar.gz -> android-tools-9.0.0_r3-core.tar.gz https://github.com/google/boringssl/archive/45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz -> boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz mirror://gentoo/android-tools-9.0.0_r3-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-e2fsprogs.tar.xz mirror://gentoo/android-tools-9.0.0_r3-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-extras.tar.xz mirror://gentoo/android-tools-9.0.0_r3-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-selinux.tar.xz mirror://gentoo/android-tools-9.0.0_r3-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3-f2fs-tools.tar.xz mirror://gentoo/android-tools-9.0.0_r3.ninja.xz https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_r3.ninja.xz https://raw.githubusercontent.com/nmeum/android-tools/8a30dba5768304176fd78aaa131242f6b880f828/patches/core/0022-Use-glibc-s-gettid-when-using-glibc-2.30.patch -> android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch https://dev.gentoo.org/~zmedico/dist/android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c85e299949b62358f6feceb94c97c2a7
+_md5_=2a64547c01d2deb9774bccd999a67dd0
diff --git a/metadata/md5-cache/dev-util/catkin-0.8.3-r1 b/metadata/md5-cache/dev-util/catkin-0.8.3-r1
deleted file mode 100644
index 72458b77dd55..000000000000
--- a/metadata/md5-cache/dev-util/catkin-0.8.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/cmake dev-util/ninja >=dev-util/cmake-3.9.6
-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 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/empy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/cmake test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/catkin
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/empy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/cmake
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/catkin/archive/0.8.3.tar.gz -> catkin-0.8.3.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96dd59faa82dc5e6811f1ad2d673c9cc
diff --git a/metadata/md5-cache/dev-util/catkin-0.8.8-r1 b/metadata/md5-cache/dev-util/catkin-0.8.8-r1
index cd2de56dff69..f307327a2309 100644
--- a/metadata/md5-cache/dev-util/catkin-0.8.8-r1
+++ b/metadata/md5-cache/dev-util/catkin-0.8.8-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 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 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/empy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/cmake test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/empy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-util/cmake test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/catkin
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/empy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/cmake
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/empy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-util/cmake
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/catkin/archive/0.8.8.tar.gz -> catkin-0.8.8.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9548f9bec4d6b0646452d13d535a55f7
+_md5_=50239110eaf08f5b413a904deb86bbfd
diff --git a/metadata/md5-cache/dev-util/catkin-9999 b/metadata/md5-cache/dev-util/catkin-9999
index de1a03528eee..f0812a7f9cfc 100644
--- a/metadata/md5-cache/dev-util/catkin-9999
+++ b/metadata/md5-cache/dev-util/catkin-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/empy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/cmake test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/empy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-util/cmake test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Cmake macros and associated python code used to build some parts of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/catkin
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/empy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/cmake
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/empy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-util/cmake
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9548f9bec4d6b0646452d13d535a55f7
+_md5_=50239110eaf08f5b413a904deb86bbfd
diff --git a/metadata/md5-cache/dev-util/herdtools7-7.47 b/metadata/md5-cache/dev-util/herdtools7-7.47
index 2206eb688ad4..eb62e4ad2e87 100644
--- a/metadata/md5-cache/dev-util/herdtools7-7.47
+++ b/metadata/md5-cache/dev-util/herdtools7-7.47
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install
-DEPEND=dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam-installer
 DESCRIPTION=The Herd toolsuite to deal with .cat memory models
 EAPI=6
 HOMEPAGE=http://diy.inria.fr/sources/index.html
@@ -8,5 +8,5 @@ LICENSE=CeCILL-B
 RDEPEND=>=dev-lang/ocaml-4.02.0 >=dev-lang/ocaml-4:=
 SLOT=0
 SRC_URI=https://github.com/herd/herdtools7/archive/7.47.tar.gz -> herdtools7-7.47.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=676ce5a4ed692d83908c517610d6cf8a
diff --git a/metadata/md5-cache/dev-util/herdtools7-7.51 b/metadata/md5-cache/dev-util/herdtools7-7.51
index e617fe68e996..953ea2893d7e 100644
--- a/metadata/md5-cache/dev-util/herdtools7-7.51
+++ b/metadata/md5-cache/dev-util/herdtools7-7.51
@@ -1,5 +1,6 @@
+BDEPEND=dev-ml/opam-installer dev-lang/ocaml
 DEFINED_PHASES=compile install
-DEPEND=dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam
+DEPEND=dev-ml/ocamlbuild >=dev-lang/ocaml-4:=
 DESCRIPTION=The Herd toolsuite to deal with .cat memory models
 EAPI=7
 HOMEPAGE=http://diy.inria.fr/sources/index.html
@@ -8,5 +9,5 @@ LICENSE=CeCILL-B
 RDEPEND=>=dev-lang/ocaml-4.02.0 >=dev-lang/ocaml-4:=
 SLOT=0
 SRC_URI=https://github.com/herd/herdtools7/archive/7.51.tar.gz -> herdtools7-7.51.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
+_eclasses_=opam	4f1cff0457cf4790a5510753a67d1cc1
 _md5_=974f9fc0521c1807ea539d583457c728
diff --git a/metadata/md5-cache/dev-util/rbtools-1.0.3 b/metadata/md5-cache/dev-util/rbtools-1.0.3
index 1cd2ee1578c3..3468885c1ab4 100644
--- a/metadata/md5-cache/dev-util/rbtools-1.0.3
+++ b/metadata/md5-cache/dev-util/rbtools-1.0.3
@@ -5,11 +5,11 @@ DESCRIPTION=Command line tools for use with Review Board
 EAPI=7
 HOMEPAGE=https://www.reviewboard.org/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tqdm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/texttable[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/colorama[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://downloads.reviewboard.org/releases/RBTools/1.0/RBTools-1.0.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2b1d60167e4efacd803e4cf566f32d67
+_md5_=4d91420a570a71d5b36e8bf508c0a44c
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 9d3d4a7cedc2..c51badcd0e46 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/love-0.10.2 b/metadata/md5-cache/games-engines/love-0.10.2
deleted file mode 100644
index 98cc8bfadca6..000000000000
--- a/metadata/md5-cache/games-engines/love-0.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=sys-libs/zlib dev-games/physfs !luajit? ( dev-lang/lua:0[deprecated] ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
-DESCRIPTION=A framework for 2D games in Lua
-EAPI=6
-HOMEPAGE=http://love2d.org/
-IUSE=+luajit
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ZLIB
-RDEPEND=sys-libs/zlib dev-games/physfs !luajit? ( dev-lang/lua:0[deprecated] ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
-SLOT=0.10
-SRC_URI=https://www.bitbucket.org/rude/love/downloads/love-0.10.2-linux-src.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c523044ddef69f5875a9baf35c722e9
diff --git a/metadata/md5-cache/games-engines/love-0.7.2-r2 b/metadata/md5-cache/games-engines/love-0.7.2-r2
index e9478637d53f..cd4b31606f46 100644
--- a/metadata/md5-cache/games-engines/love-0.7.2-r2
+++ b/metadata/md5-cache/games-engines/love-0.7.2-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=dev-games/physfs dev-lang/lua:0[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype:2 media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng:0 media-libs/tiff:0
 DESCRIPTION=A framework for 2D games in Lua
 EAPI=6
-HOMEPAGE=http://love2d.org/
+HOMEPAGE=https://love2d.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 RDEPEND=dev-games/physfs dev-lang/lua:0[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype:2 media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 SLOT=0.7
-SRC_URI=https://www.bitbucket.org/rude/love/downloads/love-0.7.2-linux-src.tar.gz
-_md5_=20488224906737afee1d9dea5fc65bb8
+SRC_URI=https://github.com/love2d/love/releases/download/0.7.2/love-0.7.2-linux-src.tar.gz
+_md5_=7597b152e385246c60dcc3c61eaaab5b
diff --git a/metadata/md5-cache/games-engines/love-0.8.0-r1 b/metadata/md5-cache/games-engines/love-0.8.0-r1
deleted file mode 100644
index f383a5cd0229..000000000000
--- a/metadata/md5-cache/games-engines/love-0.8.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-games/physfs dev-lang/lua:0[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype:2 media-libs/libmodplug media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng:0 media-libs/tiff:0
-DESCRIPTION=A framework for 2D games in Lua
-EAPI=6
-HOMEPAGE=http://love2d.org/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ZLIB
-RDEPEND=dev-games/physfs dev-lang/lua:0[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype:2 media-libs/libmodplug media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
-SLOT=0
-SRC_URI=https://www.bitbucket.org/rude/love/downloads/love-0.8.0-linux-src.tar.gz
-_md5_=4677f6381102ce4517add3fd7a28e579
diff --git a/metadata/md5-cache/games-engines/love-0.8.0-r2 b/metadata/md5-cache/games-engines/love-0.8.0-r2
index c395b378f888..1b0e3ce38c0c 100644
--- a/metadata/md5-cache/games-engines/love-0.8.0-r2
+++ b/metadata/md5-cache/games-engines/love-0.8.0-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=dev-games/physfs dev-lang/lua:0[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype:2 media-libs/libmodplug media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng:0 media-libs/tiff:0
 DESCRIPTION=A framework for 2D games in Lua
 EAPI=6
-HOMEPAGE=http://love2d.org/
+HOMEPAGE=https://love2d.org/
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=ZLIB
 RDEPEND=dev-games/physfs dev-lang/lua:0[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype:2 media-libs/libmodplug media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 SLOT=0.8
-SRC_URI=https://www.bitbucket.org/rude/love/downloads/love-0.8.0-linux-src.tar.gz
-_md5_=76d7efad7ed6ee06b2fdcdac7ba55b5d
+SRC_URI=https://github.com/love2d/love/releases/download/0.8.0/love-0.8.0-linux-src.tar.gz
+_md5_=6333adaf51aedc343e64bdeec435183c
diff --git a/metadata/md5-cache/games-engines/love-11.1 b/metadata/md5-cache/games-engines/love-11.1
deleted file mode 100644
index cf31c9525149..000000000000
--- a/metadata/md5-cache/games-engines/love-11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=sys-libs/zlib !luajit? ( dev-lang/lua:0[deprecated] ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
-DESCRIPTION=A framework for 2D games in Lua
-EAPI=6
-HOMEPAGE=http://love2d.org/
-IUSE=+luajit
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ZLIB
-RDEPEND=sys-libs/zlib !luajit? ( dev-lang/lua:0[deprecated] ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
-SLOT=0
-SRC_URI=https://www.bitbucket.org/rude/love/downloads/love-11.1-linux-src.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25ca4db7e5187ddc019cb81a2610ad90
diff --git a/metadata/md5-cache/games-engines/love-11.3 b/metadata/md5-cache/games-engines/love-11.3
new file mode 100644
index 000000000000..dcad5380bba6
--- /dev/null
+++ b/metadata/md5-cache/games-engines/love-11.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=sys-libs/zlib !luajit? ( dev-lang/lua:0 ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
+DESCRIPTION=A framework for 2D games in Lua
+EAPI=7
+HOMEPAGE=https://love2d.org/
+IUSE=+luajit
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ZLIB
+RDEPEND=sys-libs/zlib !luajit? ( dev-lang/lua:0 ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/love2d/love/releases/download/11.3/love-11.3-linux-src.tar.gz
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ebb8e158f52645b3f4e18ae435024e7a
diff --git a/metadata/md5-cache/games-engines/love-11.3-r100 b/metadata/md5-cache/games-engines/love-11.3-r100
new file mode 100644
index 000000000000..f6cf612690ec
--- /dev/null
+++ b/metadata/md5-cache/games-engines/love-11.3-r100
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=sys-libs/zlib lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
+DESCRIPTION=A framework for 2D games in Lua
+EAPI=7
+HOMEPAGE=https://love2d.org/
+IUSE=lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ZLIB
+RDEPEND=sys-libs/zlib lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
+SLOT=0
+SRC_URI=https://github.com/love2d/love/releases/download/11.3/love-11.3-linux-src.tar.gz
+_eclasses_=lua-single	d51249bd993b9dda6dde2d2276b8dc90	lua-utils	e46ac6841ad67e06b94d930fc64adf6c	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=771fbb30f04cf5c19ff95f0f7e98e9c5
diff --git a/metadata/md5-cache/games-engines/love-9999 b/metadata/md5-cache/games-engines/love-9999
index 001a323a6756..2a2f276aa442 100644
--- a/metadata/md5-cache/games-engines/love-9999
+++ b/metadata/md5-cache/games-engines/love-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=sys-libs/zlib !luajit? ( dev-lang/lua:0[deprecated] ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl dev-vcs/mercurial
+DEPEND=sys-libs/zlib !luajit? ( dev-lang/lua:0 ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 DESCRIPTION=A framework for 2D games in Lua
-EAPI=6
+EAPI=7
 HOMEPAGE=http://love2d.org/
 IUSE=+luajit
 LICENSE=ZLIB
 PROPERTIES=live
-RDEPEND=sys-libs/zlib !luajit? ( dev-lang/lua:0[deprecated] ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
+RDEPEND=sys-libs/zlib !luajit? ( dev-lang/lua:0 ) luajit? ( dev-lang/luajit:2 ) media-libs/freetype media-libs/libmodplug media-libs/libsdl2[joystick,opengl] media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mercurial	d22fe98ea362174612a57c233239102f	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f2d49ca668ee679e6d96018cc48d4c0f
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3cbcc554b4415ccab122d3e98f621746
diff --git a/metadata/md5-cache/games-engines/openmw-0.46.0 b/metadata/md5-cache/games-engines/openmw-0.46.0
index 6731ce2f260b..dfa8719eb13f 100644
--- a/metadata/md5-cache/games-engines/openmw-0.46.0
+++ b/metadata/md5-cache/games-engines/openmw-0.46.0
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[doc] dev-python/sphinx ) test? ( dev-cpp/gtest ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:= virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+DEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[-double-precision] virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 DESCRIPTION=Open source reimplementation of TES III: Morrowind
 EAPI=7
 HOMEPAGE=https://openmw.org/ https://gitlab.com/OpenMW/openmw
 IUSE=doc devtools +osg-fork test +qt5
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3 MIT BitstreamVera ZLIB
-RDEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:= virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+RDEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[-double-precision] virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenMW/openmw/archive/openmw-0.46.0.tar.gz https://gitlab.com/OpenMW/openmw/-/merge_requests/163.patch -> openmw-0.46.0-floattest.patch
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4b0bd9225c706fd519c7da2e5d55b3b
+_md5_=3c186279f6a8c3c355c0db1ba45fe9b9
diff --git a/metadata/md5-cache/games-engines/openmw-9999 b/metadata/md5-cache/games-engines/openmw-9999
index 93d4ad75a999..4e3739a1956c 100644
--- a/metadata/md5-cache/games-engines/openmw-9999
+++ b/metadata/md5-cache/games-engines/openmw-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[doc] dev-python/sphinx ) test? ( dev-cpp/gtest ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:= virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+DEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 DESCRIPTION=Open source reimplementation of TES III: Morrowind
 EAPI=7
 HOMEPAGE=https://openmw.org/ https://gitlab.com/OpenMW/openmw
 IUSE=doc devtools +osg-fork test +qt5
 LICENSE=GPL-3 MIT BitstreamVera ZLIB
 PROPERTIES=live
-RDEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:= virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+RDEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:=[double-precision] virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=21ef3a8ea98d02753172b36b9221470a
+_md5_=2468e9eec016c8d667484825d140ad11
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index a5cac5faf2b5..08164764852d 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/chocolate-doom-3.0.1 b/metadata/md5-cache/games-fps/chocolate-doom-3.0.1
index c43838f1e813..8363d5469618 100644
--- a/metadata/md5-cache/games-fps/chocolate-doom-3.0.1
+++ b/metadata/md5-cache/games-fps/chocolate-doom-3.0.1
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2+
 RDEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[midi?,vorbis?] media-libs/sdl2-net libsamplerate? ( media-libs/libsamplerate ) png? ( media-libs/libpng:= )
 SLOT=0
-SRC_URI=https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-3.0.1.tar.gz
+SRC_URI=https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-3.0.1.tar.gz https://gist.githubusercontent.com/vilhelmgray/28d4713cb6387ad62ab76cfac1443355/raw/f7600d93ca45a5102969b8f89974a3c36a3563f5/chocolate-doom-3.0.1-overhaul-manpages-add-parameters.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74f25967f511f28266cb7c5864017b4b
+_md5_=1f84f2e30e550d5c7351e15ee4683d4d
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index b6f41ddc3963..444bf385bb71 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/pyfa-2.24.1 b/metadata/md5-cache/games-util/pyfa-2.29.0
similarity index 87%
rename from metadata/md5-cache/games-util/pyfa-2.24.1
rename to metadata/md5-cache/games-util/pyfa-2.29.0
index 661e25b9c389..3e8459837ea7 100644
--- a/metadata/md5-cache/games-util/pyfa-2.24.1
+++ b/metadata/md5-cache/games-util/pyfa-2.29.0
@@ -1,6 +1,6 @@
 BDEPEND=app-arch/zip
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/cryptography-2.3[python_targets_python3_7(-)] >=dev-python/logbook-1.0.0[python_targets_python3_7(-)] >=dev-python/pyyaml-5.1[python_targets_python3_7(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+DEFINED_PHASES=install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/cryptography-2.3[python_targets_python3_7(-)] >=dev-python/logbook-1.0.0[python_targets_python3_7(-)] >=dev-python/pyyaml-5.1[python_targets_python3_7(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
 EAPI=7
 HOMEPAGE=https://github.com/pyfa-org/Pyfa
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_t
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.24.1.tar.gz -> pyfa-2.24.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d99cc57d014b7fd95ff3a644892fb0ce
+SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.29.0.tar.gz -> pyfa-2.29.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a1d1b06f317ef08b591ff84cbcac5008
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 53a8792de0ba..bac0e246cdb2 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.8.3-r1 b/metadata/md5-cache/kde-misc/kdiff3-1.8.3-r1
deleted file mode 100644
index dc83c9f475dc..000000000000
--- a/metadata/md5-cache/kde-misc/kdiff3-1.8.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Frontend to diff3 based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kdiff3 https://userbase.kde.org/KDiff3
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.8.3.tar.xz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a225a721475962cc415406dc800a18c1
diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.8.4 b/metadata/md5-cache/kde-misc/kdiff3-1.8.4
index 7fee6fdff198..8cea124bf0ac 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-1.8.4
+++ b/metadata/md5-cache/kde-misc/kdiff3-1.8.4
@@ -5,10 +5,10 @@ DESCRIPTION=Frontend to diff3 based on KDE Frameworks
 EAPI=7
 HOMEPAGE=https://kde.org/applications/development/org.kde.kdiff3 https://userbase.kde.org/KDiff3
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.8.4.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1ab3c405cf9507f402f31c72d025e89
+_md5_=77b8ea1e43f59577a57bcaaed28e6fe4
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index c820295daf8b..28a5207c084a 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/bluedevil-5.20.0 b/metadata/md5-cache/kde-plasma/bluedevil-5.20.0
new file mode 100644
index 000000000000..b7def301a080
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/bluez-qt-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/bluedevil
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/bluez-qt-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/bluedevil-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4f3efe335f626215d579e0465753b711
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.20.0 b/metadata/md5-cache/kde-plasma/breeze-5.20.0
new file mode 100644
index 000000000000..a7ec94708c50
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.0:5 wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Breeze visual style for the Plasma desktop
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/breeze
+IUSE=wayland X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-frameworks/breeze-icons-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.0:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.0:5 wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/breeze-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c719c56f90059961a761772707b40dc8
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.20.0 b/metadata/md5-cache/kde-plasma/breeze-grub-5.20.0
new file mode 100644
index 000000000000..b50b427bac5e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.20.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install nofetch prepare unpack
+DESCRIPTION=Breeze theme for GRUB
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/breeze-grub-5.20.0.tar.xz
+_eclasses_=kde.org	16ab706e1b049cfaa65425a0c0e28cac
+_md5_=a73f5cb98e14ec4847aedb636df01e5f
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.20.0 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.20.0
new file mode 100644
index 000000000000..63389f4d96bc
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) dev-lang/sassc >=dev-util/cmake-3.16 || ( ( dev-lang/python:3.9 dev-python/pycairo[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/pycairo[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) >=kde-plasma/breeze-5.20.0:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/breeze-gtk-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3a65a52597c1520ac81f2cb3004bda08
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.20.0 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.20.0
new file mode 100644
index 000000000000..e747978d9d03
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.20.0
@@ -0,0 +1,13 @@
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.74.0:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=sys-boot/plymouth
+DESCRIPTION=Breeze theme for Plymouth
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=sys-boot/plymouth
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/breeze-plymouth-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b9d3ea0ee4999ee03e659f5091329e6
diff --git a/metadata/md5-cache/kde-plasma/discover-5.20.0 b/metadata/md5-cache/kde-plasma/discover-5.20.0
new file mode 100644
index 000000000000..6db02b564011
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/discover-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/attica-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 firmware? ( sys-apps/fwupd ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma resources management GUI
+EAPI=7
+HOMEPAGE=https://userbase.kde.org/Discover
+IUSE=+firmware telemetry test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/attica-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 firmware? ( sys-apps/fwupd ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/discover-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fd72fcb98f2804505d565e12f46d7d5a
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.20.0 b/metadata/md5-cache/kde-plasma/drkonqi-5.20.0
new file mode 100644
index 000000000000..2cbb92c1c216
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/syntax-highlighting-5.74.0:5 X? ( >=dev-qt/qtx11extras-5.15.1:5 ) >=dev-qt/qtconcurrent-5.15.1:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/syntax-highlighting-5.74.0:5 X? ( >=dev-qt/qtx11extras-5.15.1:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/drkonqi-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3dc219730aaf3e7e129561909862bb07
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.20.0 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.20.0
new file mode 100644
index 000000000000..7a41c4c056a4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsql-5.15.1:5[sqlite] >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsql-5.15.1:5[sqlite] >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kactivitymanagerd-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0cf3d3b10dd9c76d21b626fc141b1ebc
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.20.0 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.20.0
new file mode 100644
index 000000000000..76923e00fd50
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.20.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/libkworkspace-5.20.0:5 kdesu? ( >=kde-frameworks/kdesu-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
+IUSE=kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/libkworkspace-5.20.0:5 kdesu? ( >=kde-frameworks/kdesu-5.74.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=kdesu? ( X )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kde-cli-tools-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d7f093e0f4883707934df783f8174940
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.20.0 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.20.0
new file mode 100644
index 000000000000..4c1d245f8b1d
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/sassc dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-plasma/kdecoration-5.20.0:5 x11-libs/gtk+:2 x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=GTK2 and GTK3 configurator for KDE Plasma
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-plasma/kdecoration-5.20.0:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.20.0:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kde-gtk-config-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c61f02c310a94e8ea0d172b2de6845a6
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.20.0 b/metadata/md5-cache/kde-plasma/kdecoration-5.20.0
new file mode 100644
index 000000000000..bad723b6eb95
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/ki18n-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugin based library to create window decorations
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/ki18n-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kdecoration-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2f758cb931e2ceabcbd57f5f1d80f4a9
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.0 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.0
new file mode 100644
index 000000000000..0fce2e60de95
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kholidays-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kunitconversion-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 comic? ( >=kde-frameworks/kross-5.74.0:5 ) share? ( >=kde-frameworks/purpose-5.74.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.1:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=comic share webengine test debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kholidays-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kunitconversion-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 comic? ( >=kde-frameworks/kross-5.74.0:5 ) share? ( >=kde-frameworks/purpose-5.74.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.1:5 ) >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-plasma/plasma-workspace-5.20.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kdeplasma-addons-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=52076d0c8240911f9e68bb52b1cd70e3
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.20.0 b/metadata/md5-cache/kde-plasma/kgamma-5.20.0
new file mode 100644
index 000000000000..10422e6d0d4b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Screen gamma values kcontrol module
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kgamma5-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e3df5ea8862ea764fecae8384ba04dab
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.20.0 b/metadata/md5-cache/kde-plasma/khotkeys-5.20.0
new file mode 100644
index 000000000000..6255030b5f9e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5[X] >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5[X] >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/khotkeys-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2a73871c217d86dbb8769ef4b6ce0944
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.20.0 b/metadata/md5-cache/kde-plasma/kinfocenter-5.20.0
new file mode 100644
index 000000000000..abb26f604790
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.14.3 dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[gles2-only=] >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.74.0:5 media-libs/mesa[egl] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Utility providing information about the computer hardware
+EAPI=7
+HOMEPAGE=https://userbase.kde.org/KInfoCenter
+IUSE=gles2-only ieee1394 +opengl +pci wayland debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[gles2-only=] >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.74.0:5 media-libs/mesa[egl] ) >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.0:5 >=kde-plasma/systemsettings-5.20.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kinfocenter-5.20.0.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b1f58b89355fe4c7ae7c9d7575d7aec3
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.20.0 b/metadata/md5-cache/kde-plasma/kmenuedit-5.20.0
new file mode 100644
index 000000000000..ad4fca1ffd1e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma menu editor
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kmenuedit-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1f8a44c19ae2db44efbbb6cbe5cd24d7
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.20.0 b/metadata/md5-cache/kde-plasma/kscreen-5.20.0
new file mode 100644
index 000000000000..109ce4c35992
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/libkscreen-5.20.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma screen management
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kscreen
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/libkscreen-5.20.0:5 >=dev-qt/qtgraphicaleffects-5.15.1:5 >=kde-plasma/kde-cli-tools-5.20.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kscreen-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3f6342e574fab14bce248bf12e450ab
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.20.0 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.20.0
new file mode 100644
index 000000000000..0f5e8b204272
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.20.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library and components for secure lock screen architecture
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=+pam test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.20.0:5
+RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kscreenlocker-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c28665f45b639d1c1707fe1fbac42bd8
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.20.0 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.20.0
new file mode 100644
index 000000000000..a434a7282aca
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/ksshaskpass-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3131492101c401008ad019563a3b7d80
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.20.0 b/metadata/md5-cache/kde-plasma/ksysguard-5.20.0
new file mode 100644
index 000000000000..38f5d1e51dc5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libksysguard-5.20.0:5 lm-sensors? ( sys-apps/lm-sensors:= ) network? ( dev-libs/libnl:3 net-libs/libpcap sys-libs/libcap ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Network-enabled task manager and system monitor
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=lm-sensors +network networkmanager debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libksysguard-5.20.0:5 lm-sensors? ( sys-apps/lm-sensors:= ) network? ( dev-libs/libnl:3 net-libs/libpcap sys-libs/libcap ) networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/ksysguard-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8dc913d6fa00279775163375799b4c6e
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.20.0 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.20.0
new file mode 100644
index 000000000000..f4d5ce816154
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.74.0:5 sys-libs/pam dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=PAM module to not enter KWallet password again after login
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.74.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kwallet-pam-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b198a638f9f3ca4d0a8057f62f60b7de
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.20.0 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.20.0
new file mode 100644
index 000000000000..2aaae55a027f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kwayland-integration-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5c06628ee8b9a1ea7e390f771eeae063
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.20.0 b/metadata/md5-cache/kde-plasma/kwayland-server-5.20.0
new file mode 100644
index 000000000000..825bbe6e05c5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.18.0 >=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[egl] >=dev-qt/qtwayland-5.15.1:5 >=kde-frameworks/kwayland-5.74.0:5 media-libs/mesa[egl] >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-libs/wayland-protocols-1.15 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Wayland Server Components built on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/wayland-1.18.0 >=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtgui-5.15.1:5[egl] >=dev-qt/qtwayland-5.15.1:5 >=kde-frameworks/kwayland-5.74.0:5 media-libs/mesa[egl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kwayland-server-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2cb27f23218068cbd429541d1edc77d3
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.20.0 b/metadata/md5-cache/kde-plasma/kwin-5.20.0
new file mode 100644
index 000000000000..28894ee3f5b4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwin-5.20.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[gles2-only=] >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5= >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5= >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5[X] >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/breeze-5.20.0:5 >=kde-plasma/kdecoration-5.20.0:5 >=kde-plasma/kscreenlocker-5.20.0:5 >=kde-plasma/kwayland-server-5.20.0:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.1:5 >=dev-qt/qtconcurrent-5.15.1:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=accessibility caps gles2-only multimedia screencast test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+PDEPEND=>=kde-plasma/kde-cli-tools-5.20.0:5
+RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[gles2-only=] >=dev-qt/qtscript-5.15.1:5 >=dev-qt/qtsensors-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5= >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5= >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5[X] >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/breeze-5.20.0:5 >=kde-plasma/kdecoration-5.20.0:5 >=kde-plasma/kscreenlocker-5.20.0:5 >=kde-plasma/kwayland-server-5.20.0:5 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,wayland,X(+)] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=dev-qt/qtvirtualkeyboard-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5[qml] multimedia? ( >=dev-qt/qtmultimedia-5.15.1:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kwin-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=57a48b6560bd7d4514385e25c29c6b29
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.20.0 b/metadata/md5-cache/kde-plasma/kwrited-5.20.0
new file mode 100644
index 000000000000..1f8a62b8bce1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpty-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma daemon listening for wall and write messages
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kpty-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/kwrited-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ffae60a81c46202742281f04a85798f7
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.20.0 b/metadata/md5-cache/kde-plasma/libkscreen-5.20.0
new file mode 100644
index 000000000000..a0944fe4c78a
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma screen management library
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/7
+SRC_URI=mirror://kde/stable/plasma/5.20.0/libkscreen-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=55b57fad6a5a95176133f8b06d6067bb
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.20.0 b/metadata/md5-cache/kde-plasma/libksysguard-5.20.0
new file mode 100644
index 000000000000..afd10ceb5aad
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.1:5 >=dev-qt/qtwebengine-5.15.1:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/plasma-workspace-5.18.80:5 >=kde-frameworks/kiconthemes-5.74.0:5 X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Task management and system monitoring library
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=webengine X test debug designer test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.1:5 >=dev-qt/qtwebengine-5.15.1:5 ) X? ( >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libX11 x11-libs/libXres ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/9
+SRC_URI=mirror://kde/stable/plasma/5.20.0/libksysguard-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=81f9898143a0dd38b315b71de4a348e5
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.20.0 b/metadata/md5-cache/kde-plasma/libkworkspace-5.20.0
new file mode 100644
index 000000000000..d3f407a18c2b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/kscreenlocker-5.20.0:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.20.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Workspace library to interact with the Plasma session manager
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kinit-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-plasma/kscreenlocker-5.20.0:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-workspace-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=19994d38f7ba4539dda890cb5adbc92a
diff --git a/metadata/md5-cache/kde-plasma/milou-5.20.0 b/metadata/md5-cache/kde-plasma/milou-5.20.0
new file mode 100644
index 000000000000..2df619001f8c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/milou-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Dedicated search application built on top of Baloo
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/milou
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/milou-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0751caa043171457a4a042e6e07512d4
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.20.0 b/metadata/md5-cache/kde-plasma/oxygen-5.20.0
new file mode 100644
index 000000000000..253a01f3dcc1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.0:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) >=kde-frameworks/kservice-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/oxygen
+IUSE=wayland debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.20.0:5
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/frameworkintegration-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-plasma/kdecoration-5.20.0:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.74.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/oxygen-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=93aa04208e47c15b83c999364e074195
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.20.0
new file mode 100644
index 000000000000..5258de45a5e9
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kfilemetadata-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/purpose-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kfilemetadata-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/purpose-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-browser-integration-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a61dab24ba3bd363dbc255f095f5cb50
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.20.0
new file mode 100644
index 000000000000..486bd4157f7b
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/attica-5.74.0:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 >=kde-plasma/kwin-5.20.0:5 >=kde-plasma/libksysguard-5.20.0:5 >=kde-plasma/plasma-workspace-5.20.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) dev-libs/boost x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma desktop
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=emoji ibus +kaccounts scim +semantic-desktop test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/attica-5.74.0:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-frameworks/sonnet-5.74.0:5 >=kde-plasma/kwin-5.20.0:5 >=kde-plasma/libksysguard-5.20.0:5 >=kde-plasma/plasma-workspace-5.20.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) !<kde-plasma/kdeplasma-addons-5.15.80 !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/qqc2-desktop-style-5.74.0:5 >=kde-plasma/breeze-5.20.0:5 >=kde-plasma/kde-cli-tools-5.20.0:5 >=kde-plasma/oxygen-5.20.0:5 sys-apps/util-linux x11-apps/setxkbmap kaccounts? ( net-libs/signon-oauth2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-desktop-5.20.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d14b2a37e43e10904174d7cfa77f43a8
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-disks-5.20.0
new file mode 100644
index 000000000000..22d7c5f85eae
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-disks-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 sys-apps/smartmontools dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=|| ( GPL-3 GPL-2 )
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-disks-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b2b5e5139102c77a1c7c7adaf48c78d
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-integration-5.20.0
new file mode 100644
index 000000000000..8360742e96f8
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/breeze-5.20.0:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/breeze-5.20.0:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-integration-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8a0fbf3ce43c31481bd3de9333ff5a15
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-meta-5.20.0
new file mode 100644
index 000000000000..73d76d32be99
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.20.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=bluetooth +browser-integration crypt +desktop-portal discover +display-manager +elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.20.0:5 >=kde-plasma/drkonqi-5.20.0:5 >=kde-plasma/kactivitymanagerd-5.20.0:5 >=kde-plasma/kde-cli-tools-5.20.0:5 >=kde-plasma/kdecoration-5.20.0:5 >=kde-plasma/kdeplasma-addons-5.20.0:5 >=kde-plasma/kgamma-5.20.0:5 >=kde-plasma/khotkeys-5.20.0:5 >=kde-plasma/kinfocenter-5.20.0:5 >=kde-plasma/kmenuedit-5.20.0:5 >=kde-plasma/kscreen-5.20.0:5 >=kde-plasma/kscreenlocker-5.20.0:5 >=kde-plasma/ksshaskpass-5.20.0:5 >=kde-plasma/ksysguard-5.20.0:5 >=kde-plasma/kwayland-integration-5.20.0:5 >=kde-plasma/kwayland-server-5.20.0:5 >=kde-plasma/kwin-5.20.0:5 >=kde-plasma/kwrited-5.20.0:5 >=kde-plasma/libkscreen-5.20.0:5 >=kde-plasma/libksysguard-5.20.0:5 >=kde-plasma/milou-5.20.0:5 >=kde-plasma/oxygen-5.20.0:5 >=kde-plasma/plasma-desktop-5.20.0:5 >=kde-plasma/plasma-integration-5.20.0:5 >=kde-plasma/plasma-workspace-5.20.0:5 >=kde-plasma/polkit-kde-agent-5.20.0:5 >=kde-plasma/powerdevil-5.20.0:5 >=kde-plasma/systemsettings-5.20.0:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.20.0:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.20.0:5 ) crypt? ( >=kde-plasma/plasma-vault-5.20.0:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.20.0:5 ) discover? ( >=kde-plasma/discover-5.20.0:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.20.0:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.20.0:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.20.0:5 >=kde-plasma/kde-gtk-config-5.20.0:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.20.0:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.20.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.20.0:5 net-misc/networkmanager[elogind?,systemd?] qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-5.20.0:5 >=kde-plasma/plymouth-kcm-5.20.0:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.20.0:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.20.0:5 ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.20.0:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.20.0:5 )
+REQUIRED_USE=^^ ( elogind systemd )
+SLOT=5
+_md5_=de6c5f16cd4a390d971b874749c4db78
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-nm-5.20.0
new file mode 100644
index 000000000000..7931eea75c3e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/networkmanager-qt-5.74.0:5[teamd=] >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/modemmanager-qt-5.74.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.1:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=modemmanager openconnect teamd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/networkmanager-qt-5.74.0:5[teamd=] >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/modemmanager-qt-5.74.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.1:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-nm-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ab82b7487a5d1489499efc1ff77d0f3b
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-pa-5.20.0
new file mode 100644
index 000000000000..08956c377466
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 media-libs/libcanberra media-sound/pulseaudio dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma applet for audio volume management using PulseAudio
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-pa-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a5ffcc050c5f436f8af6df92453b29fc
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.20.0
new file mode 100644
index 000000000000..baa3be1b688e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Useful applications for Plasma development
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-sdk-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=df93b65227636392391f4174f4979aa7
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.20.0
new file mode 100644
index 000000000000..1342cf10bc36
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.20.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma integration for controlling Thunderbolt devices
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-frameworks/kirigami-5.74.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-thunderbolt-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e11040e239aae27e4a652ac070151225
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-vault-5.20.0
new file mode 100644
index 000000000000..e74c49d5623f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-plasma/libksysguard-5.20.0:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma applet and services for creating encrypted vaults
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
+IUSE=networkmanager debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kcodecs-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-plasma/libksysguard-5.20.0:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) >=dev-qt/qtquickcontrols2-5.15.1:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-vault-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7dccc9c74b45f99424259be538ed81c2
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.20.0
new file mode 100644
index 000000000000..51e6b7854827
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.20.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5=[jpeg] >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwayland-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kpeople-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/prison-5.74.0:5[qml] >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/kscreenlocker-5.20.0:5 >=kde-plasma/kwin-5.20.0:5 >=kde-plasma/libkscreen-5.20.0:5 >=kde-plasma/libksysguard-5.20.0:5 >=kde-plasma/libkworkspace-5.20.0:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.74.0:5 ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.1:5 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma workspace
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.20.0:5
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5=[jpeg] >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qtsql-5.15.1:5 >=dev-qt/qtsvg-5.15.1:5 >=dev-qt/qtwayland-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kbookmarks-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kded-5.74.0:5 >=kde-frameworks/kdelibs4support-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kjobwidgets-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kpeople-5.74.0:5 >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/ktextwidgets-5.74.0:5 >=kde-frameworks/kwallet-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=kde-frameworks/prison-5.74.0:5[qml] >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/kscreenlocker-5.20.0:5 >=kde-plasma/kwin-5.20.0:5 >=kde-plasma/libkscreen-5.20.0:5 >=kde-plasma/libksysguard-5.20.0:5 >=kde-plasma/libkworkspace-5.20.0:5 >=media-libs/phonon-4.11.0 sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.74.0:5 ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.74.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) screencast? ( >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.74.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.1:5 >=dev-qt/qtgraphicaleffects-5.15.1:5 >=dev-qt/qtpaths-5.15.1:5 >=dev-qt/qtquickcontrols-5.15.1:5[widgets] >=dev-qt/qtquickcontrols2-5.15.1:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-frameworks/kdesu-5.74.0:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/kquickcharts-5.74.0:5 >=kde-plasma/ksysguard-5.20.0:5 >=kde-plasma/milou-5.20.0:5 >=kde-plasma/plasma-integration-5.20.0:5 x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.19.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-workspace-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3cb960c259f274fb600e53c2ea119eb
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.20.0 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.20.0
new file mode 100644
index 000000000000..f4877754dbdb
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.20.0
@@ -0,0 +1,11 @@
+BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DESCRIPTION=Wallpapers for the Plasma workspace
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-workspace-wallpapers-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3998fe2f2d6ed4d18dbaeb7417bdffc2
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.20.0 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.20.0
new file mode 100644
index 000000000000..b2ad5127fcb5
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for Plymouth
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.20.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plymouth-kcm-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=de747b54dd0e344015d6249947050ef4
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.20.0 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.20.0
new file mode 100644
index 000000000000..f866200c74ff
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=sys-auth/polkit-qt-0.113.0 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/polkit-kde-agent-1-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ecc6a01ac0bf11df9ba6963077726548
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.20.0 b/metadata/md5-cache/kde-plasma/powerdevil-5.20.0
new file mode 100644
index 000000000000..fe9d6bb88d01
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5[policykit] >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/libkscreen-5.20.0:5 >=kde-plasma/libkworkspace-5.20.0:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.74.0:5 >=kde-frameworks/networkmanager-qt-5.74.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/powerdevil
+IUSE=brightness-control caps +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5[policykit] >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kglobalaccel-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kidletime-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/knotifyconfig-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwayland-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/solid-5.74.0:5 >=kde-plasma/libkscreen-5.20.0:5 >=kde-plasma/libkworkspace-5.20.0:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.74.0:5 >=kde-frameworks/networkmanager-qt-5.74.0:5 ) >=kde-plasma/kde-cli-tools-5.20.0:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/powerdevil-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=958cc7067b7f69dea00fef5bd172b399
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.20.0 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.20.0
new file mode 100644
index 000000000000..bb1c5c69c543
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Plasma control module for SDDM
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/karchive-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-plasma/kde-cli-tools-5.20.0:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/sddm-kcm-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3f05ff0ada1fbbb57f0ad46a0fc4dad3
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.20.0 b/metadata/md5-cache/kde-plasma/systemsettings-5.20.0
new file mode 100644
index 000000000000..24cde3dcc479
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.74.0:5 ) >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libkworkspace-5.20.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Control Center to configure KDE Plasma desktop
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kactivities-5.74.0:5 >=kde-frameworks/kactivities-stats-5.74.0:5 >=kde-frameworks/kauth-5.74.0:5 >=kde-frameworks/kcmutils-5.74.0:5 >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-5.74.0:5 >=kde-frameworks/kconfigwidgets-5.74.0:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kcrash-5.74.0:5 >=kde-frameworks/kdbusaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/kguiaddons-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kiconthemes-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kitemmodels-5.74.0:5 >=kde-frameworks/kitemviews-5.74.0:5 >=kde-frameworks/kpackage-5.74.0:5 >=kde-frameworks/kservice-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-plasma/libkworkspace-5.20.0:5 !kde-misc/systemd-kcm >=kde-frameworks/kirigami-5.74.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/systemsettings-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cd205184584a7169ad834dc30650331f
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.0 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.0
new file mode 100644
index 000000000000..a80099043fad
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.20.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5[cups] >=dev-qt/qtwayland-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 >=dev-libs/plasma-wayland-protocols-1.1.1 >=dev-qt/qtconcurrent-5.15.1:5 >=kde-frameworks/kwayland-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtprintsupport-5.15.1:5[cups] >=dev-qt/qtwayland-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 >=kde-frameworks/kcoreaddons-5.74.0:5 >=kde-frameworks/kdeclarative-5.74.0:5 >=kde-frameworks/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/kirigami-5.74.0:5 >=kde-frameworks/knotifications-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/xdg-desktop-portal-kde-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=44f074659af71012cc9cd148fea115b3
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.0 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.0
new file mode 100644
index 000000000000..1e8c603f69d4
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.20.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=>=dev-qt/qtcore-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/extra-cmake-modules-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
+DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
+EAPI=7
+HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtcore-5.15.1:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtx11extras-5.15.1:5 >=kde-frameworks/extra-cmake-modules-5.74.0:5 >=kde-frameworks/kwindowsystem-5.74.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.20.0/plasma-workspace-5.20.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e859ceaaf0d73f3a10d0a761681dfa19
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 37c599dad23e..bf48de0f1ec5 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/milter-regex-2.7 b/metadata/md5-cache/mail-filter/milter-regex-2.7
index f852ec255bdb..485a05c4149c 100644
--- a/metadata/md5-cache/mail-filter/milter-regex-2.7
+++ b/metadata/md5-cache/mail-filter/milter-regex-2.7
@@ -3,10 +3,10 @@ DEPEND=acct-user/milter-regex || ( mail-filter/libmilter mail-mta/sendmail ) vir
 DESCRIPTION=A milter-based regular expression filter
 EAPI=7
 HOMEPAGE=https://www.benzedrine.ch/milter-regex.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=acct-user/milter-regex || ( mail-filter/libmilter mail-mta/sendmail )
 SLOT=0
 SRC_URI=https://www.benzedrine.ch/milter-regex-2.7.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=238773701eb51961a36a04f5badf4995
+_md5_=dee6da72c81a344a1deb5a811efb5422
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 411c4e638699..41b966e5d3f0 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/krita-4.2.9 b/metadata/md5-cache/media-gfx/krita-4.2.9
deleted file mode 100644
index 649391161e1c..000000000000
--- a/metadata/md5-cache/media-gfx/krita-4.2.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/boost:= dev-libs/quazip python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sip[python_targets_python3_9(-)] ) >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2-only] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/
-IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/boost:= dev-libs/quazip python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sip[python_targets_python3_9(-)] ) >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2-only] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/krita/4.2.9/krita-4.2.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/krita-4.2.9-patchset.tar.xz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f96098e64248300894c1886a615c7c5
diff --git a/metadata/md5-cache/media-gfx/krita-4.3.0 b/metadata/md5-cache/media-gfx/krita-4.3.0
index 3fa586c18bb1..33d9f63ce324 100644
--- a/metadata/md5-cache/media-gfx/krita-4.3.0
+++ b/metadata/md5-cache/media-gfx/krita-4.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedo
 EAPI=7
 HOMEPAGE=https://kde.org/applications/graphics/org.kde.krita https://krita.org/en/
 IUSE=color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc test debug test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/boost:= dev-libs/quazip python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[python_targets_python3_9(-)] dev-python/sip[python_targets_python3_9(-)] ) >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2-only] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXi color-management? ( media-libs/opencolorio ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) heif? ( media-libs/libheif:= ) openexr? ( media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/4.3.0/krita-4.3.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/krita-4.2.9-patchset.tar.xz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cbb4222ce8ad056ca7833bbf2b3260c
+_md5_=dc105651d56dd49ce7dd8022454c41ba
diff --git a/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1 b/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
index 04c92d80ba23..4340085d0486 100644
--- a/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
+++ b/metadata/md5-cache/media-gfx/sam2p-0.49.4_p20190718-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Utility to convert raster images to EPS, PDF and many others
 EAPI=7
 HOMEPAGE=https://github.com/pts/sam2p
 IUSE=examples gif
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pts/sam2p/archive/b953f63307c4a83fa4615a4863e3fb250205cd98.tar.gz -> sam2p-0.49.4_p20190718.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aec547b38d371989759bcca539d1b118
+_md5_=d6b6fd1ac87ecddc2267e3d40920b516
diff --git a/metadata/md5-cache/media-gfx/xfig-3.2.7b b/metadata/md5-cache/media-gfx/xfig-3.2.7b
index 3b1a0673d13e..e0a3ec76d7e4 100644
--- a/metadata/md5-cache/media-gfx/xfig-3.2.7b
+++ b/metadata/md5-cache/media-gfx/xfig-3.2.7b
@@ -4,10 +4,10 @@ DESCRIPTION=A menu-driven tool to draw and manipulate objects interactively in a
 EAPI=7
 HOMEPAGE=http://mcj.sourceforge.net/
 IUSE=jpeg nls postscript
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXi x11-libs/libXt media-libs/libpng:0= media-fonts/font-misc-misc media-fonts/urw-fonts >=media-gfx/transfig-3.2.5-r1 media-libs/netpbm jpeg? ( virtual/jpeg:0= ) nls? ( x11-libs/libXaw3d[unicode] ) postscript? ( app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/mcj/xfig-3.2.7b.tar.xz
 _eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8aab5c55b29b68a2a6a7a436b48a977e
+_md5_=763504a0f49e1ebfb76497a9fd33c287
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c7a38567ecea..002b6a0fe006 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/coin-3.1.3-r2 b/metadata/md5-cache/media-libs/coin-3.1.3-r2
deleted file mode 100644
index 63bbb227db66..000000000000
--- a/metadata/md5-cache/media-libs/coin-3.1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/expat media-libs/fontconfig media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext bzip2? ( app-arch/bzip2 ) javascript? ( dev-lang/spidermonkey:0 ) openal? ( media-libs/openal ) simage? ( media-libs/simage ) zlib? ( sys-libs/zlib ) virtual/pkgconfig x11-base/xorg-proto doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815
-DESCRIPTION=A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1
-EAPI=5
-HOMEPAGE=https://bitbucket.org/Coin3D/coin/wiki/Home
-IUSE=bzip2 debug doc javascript openal simage static-libs threads zlib
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 PEL )
-RDEPEND=dev-libs/expat media-libs/fontconfig media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext bzip2? ( app-arch/bzip2 ) javascript? ( dev-lang/spidermonkey:0 ) openal? ( media-libs/openal ) simage? ( media-libs/simage ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=https://bitbucket.org/Coin3D/coin/downloads/Coin-3.1.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3c1f355d3de0484fdcd62249c42d62b2
diff --git a/metadata/md5-cache/media-libs/libaom-2.0.0 b/metadata/md5-cache/media-libs/libaom-2.0.0
index cfce38a11718..9fe52a045d26 100644
--- a/metadata/md5-cache/media-libs/libaom-2.0.0
+++ b/metadata/md5-cache/media-libs/libaom-2.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Alliance for Open Media AV1 Codec SDK
 EAPI=7
 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_sse4_2 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_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=BSD-2
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/2
 SRC_URI=https://dev.gentoo.org/~lu_zero/libaom/libaom-2.0.0.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ccfd125052e3c81042d26be41196922
+_md5_=e421f9f801332d09bf598bdcceb82d55
diff --git a/metadata/md5-cache/media-libs/libdca-0.0.7 b/metadata/md5-cache/media-libs/libdca-0.0.7
index 1d9855b1b05e..353f9635d3bc 100644
--- a/metadata/md5-cache/media-libs/libdca-0.0.7
+++ b/metadata/md5-cache/media-libs/libdca-0.0.7
@@ -4,9 +4,9 @@ DESCRIPTION=Library for decoding DTS Coherent Acoustics streams used in DVD
 EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/libdca.html
 IUSE=debug oss abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.videolan.org/pub/videolan/libdca/0.0.7/libdca-0.0.7.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f07b238c83e1594513c55230c409105c
+_md5_=d62016d0920d57d3c530e23910dfc87c
diff --git a/metadata/md5-cache/media-libs/liblscp-0.6.0 b/metadata/md5-cache/media-libs/liblscp-0.6.0
deleted file mode 100644
index 705fe4e8a480..000000000000
--- a/metadata/md5-cache/media-libs/liblscp-0.6.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=C++ library for the Linux Sampler control protocol
-EAPI=7
-HOMEPAGE=https://www.linuxsampler.org
-IUSE=doc
-KEYWORDS=amd64 ~ppc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://download.linuxsampler.org/packages/liblscp-0.6.0.tar.gz
-_md5_=c1128bffdacec35d9d3e77fa9c3dba5f
diff --git a/metadata/md5-cache/media-libs/liblscp-0.6.2 b/metadata/md5-cache/media-libs/liblscp-0.6.2
index 047e617bbf69..629ad9b22464 100644
--- a/metadata/md5-cache/media-libs/liblscp-0.6.2
+++ b/metadata/md5-cache/media-libs/liblscp-0.6.2
@@ -4,8 +4,8 @@ DESCRIPTION=C++ library for the Linux Sampler control protocol
 EAPI=7
 HOMEPAGE=https://www.linuxsampler.org
 IUSE=doc
-KEYWORDS=~amd64 ~ppc x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.rncbc.org/archive/liblscp-0.6.2.tar.gz https://download.linuxsampler.org/packages/liblscp-0.6.2.tar.gz
-_md5_=c70fef1b5e2cf358a0dd7ab792a05ef6
+_md5_=3369f668e519cf5028fbf68397239f76
diff --git a/metadata/md5-cache/media-libs/libmediainfo-20.09 b/metadata/md5-cache/media-libs/libmediainfo-20.09
new file mode 100644
index 000000000000..d179e40a824f
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmediainfo-20.09
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=MediaInfo libraries
+EAPI=7
+HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
+IUSE=curl doc mms static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://mediaarea.net/download/source/libmediainfo/20.09/libmediainfo_20.09.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=771315e25e3a665d7cb0fa4947f02d8a
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.16 b/metadata/md5-cache/media-libs/libmpdclient-2.16
deleted file mode 100644
index 13ec5ddca9da..000000000000
--- a/metadata/md5-cache/media-libs/libmpdclient-2.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) test? ( dev-libs/check ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DESCRIPTION=A library for interfacing Music Player Daemon (media-sound/mpd)
-EAPI=6
-HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient
-IUSE=doc examples test
-KEYWORDS=~alpha amd64 arm ppc ppc64 ~sparc x86
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.16.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7b64e7ded38d9ac51160d3f674417a65
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.19 b/metadata/md5-cache/media-libs/libmpdclient-2.19
index c8d2b984740c..9c04ccfd8eec 100644
--- a/metadata/md5-cache/media-libs/libmpdclient-2.19
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.19
@@ -5,10 +5,10 @@ DESCRIPTION=Library for interfacing Music Player Daemon (media-sound/mpd)
 EAPI=7
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient
 IUSE=doc examples test
-KEYWORDS=~alpha ~amd64 arm ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ppc ppc64 ~sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.19.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f62608027ad2f6754cfab18cb92edde3
+_md5_=9242e7a48cda94bd58fce3dc7b460a1f
diff --git a/metadata/md5-cache/media-libs/libpgf-6.12.27 b/metadata/md5-cache/media-libs/libpgf-6.12.27
deleted file mode 100644
index b6f09f48e7ac..000000000000
--- a/metadata/md5-cache/media-libs/libpgf-6.12.27
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Library to load, handle and manipulate images in the PGF format
-EAPI=7
-HOMEPAGE=https://www.libpgf.org/
-IUSE=doc
-KEYWORDS=amd64 ~ppc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/libpgf-6.12.27.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bdd52774af0e8f798b038f2b742efc36
diff --git a/metadata/md5-cache/media-libs/libpgf-7.19.3 b/metadata/md5-cache/media-libs/libpgf-7.19.3
index 5fd17d9aed7c..f83468876eae 100644
--- a/metadata/md5-cache/media-libs/libpgf-7.19.3
+++ b/metadata/md5-cache/media-libs/libpgf-7.19.3
@@ -4,9 +4,9 @@ DESCRIPTION=Library to load, handle and manipulate images in the PGF format
 EAPI=7
 HOMEPAGE=https://www.libpgf.org/
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/libpgf/libpgf/7.19.3-latest/libPGF-codec-and-console-src.zip -> libpgf-7.19.3.zip
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6e055012ecc2ce98599b8dbf18a3139a
+_md5_=5c5e5598c8b65e4eabfc750c1bb9df11
diff --git a/metadata/md5-cache/media-libs/libsamplerate-0.1.9-r1 b/metadata/md5-cache/media-libs/libsamplerate-0.1.9-r1
index 1e63cfcb33e3..4535e3477916 100644
--- a/metadata/md5-cache/media-libs/libsamplerate-0.1.9-r1
+++ b/metadata/md5-cache/media-libs/libsamplerate-0.1.9-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter fo
 EAPI=7
 HOMEPAGE=http://www.mega-nerd.com/SRC/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/SRC/libsamplerate-0.1.9.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=35830be4edc5d31561c50b066a98ecac
+_md5_=e31325427d4612f138aa090662813a2c
diff --git a/metadata/md5-cache/media-libs/libtimidity-0.2.6 b/metadata/md5-cache/media-libs/libtimidity-0.2.6
index 0759f55cf404..aa59f3636513 100644
--- a/metadata/md5-cache/media-libs/libtimidity-0.2.6
+++ b/metadata/md5-cache/media-libs/libtimidity-0.2.6
@@ -5,11 +5,11 @@ DESCRIPTION=MIDI to WAVE converter library
 EAPI=7
 HOMEPAGE=http://libtimidity.sourceforge.net
 IUSE=ao debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=ao? ( >=media-libs/libao-1.1.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=mirror://sourceforge/libtimidity/libtimidity-0.2.6.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7bc8a173526912531b53c9cbcb5145ba
+_md5_=7b58eea6d78481c5531e80b82dd1ce9b
diff --git a/metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.1 b/metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.1
new file mode 100644
index 000000000000..5f8357317337
--- /dev/null
+++ b/metadata/md5-cache/media-libs/nv-codec-headers-10.0.26.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=FFmpeg version of headers required to interface with Nvidias codec APIs
+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_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=x11-drivers/nvidia-drivers-445.87[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://github.com/FFmpeg/nv-codec-headers/releases/download/n10.0.26.1/nv-codec-headers-10.0.26.1.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2f4ff2fbeb9cb490a958e303b3c0ac1d
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index a712027e6478..a3a5657c6058 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/live-2020.05.15 b/metadata/md5-cache/media-plugins/live-2020.05.15
index 14988691307d..924c301e2013 100644
--- a/metadata/md5-cache/media-plugins/live-2020.05.15
+++ b/metadata/md5-cache/media-plugins/live-2020.05.15
@@ -5,10 +5,10 @@ DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
 EAPI=7
 HOMEPAGE=http://www.live555.com/
 IUSE=libressl ssl
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0/9
 SRC_URI=http://www.live555.com/liveMedia/public/live.2020.05.15.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=336d319949ecbc5c83229a589c0f4c88
+_md5_=bf3d8b931950147fbf10cf12aba0e16e
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 78a75ebf0384..a2aa4e1317e4 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/qsynth-0.6.2 b/metadata/md5-cache/media-sound/qsynth-0.6.2
deleted file mode 100644
index 215ba459ac80..000000000000
--- a/metadata/md5-cache/media-sound/qsynth-0.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-DESCRIPTION=A Qt application to control FluidSynth
-EAPI=7
-HOMEPAGE=https://qsynth.sourceforge.io/
-IUSE=+alsa debug jack pulseaudio
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-REQUIRED_USE=|| ( alsa jack pulseaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/qsynth/qsynth-0.6.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9295aca3c2cb081673cf9719c3d1ba20
diff --git a/metadata/md5-cache/media-sound/qsynth-0.6.3 b/metadata/md5-cache/media-sound/qsynth-0.6.3
index 72d2d3e84290..8f1376f49f5e 100644
--- a/metadata/md5-cache/media-sound/qsynth-0.6.3
+++ b/metadata/md5-cache/media-sound/qsynth-0.6.3
@@ -5,11 +5,11 @@ DESCRIPTION=Qt application to control FluidSynth
 EAPI=7
 HOMEPAGE=https://qsynth.sourceforge.io/
 IUSE=+alsa debug jack pulseaudio
-KEYWORDS=~amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
 REQUIRED_USE=|| ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/qsynth/qsynth-0.6.3.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6589ee95664b082340d35c05450832a5
+_md5_=24667962220b666e6d9bdaa052e57d8a
diff --git a/metadata/md5-cache/media-sound/quimup-1.4.3 b/metadata/md5-cache/media-sound/quimup-1.4.3
deleted file mode 100644
index b0ab82c0da40..000000000000
--- a/metadata/md5-cache/media-sound/quimup-1.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=media-libs/libmpdclient-2.3 media-libs/taglib virtual/pkgconfig
-DESCRIPTION=A Qt5 client for the music player daemon (MPD) written in C++
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/quimup/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=media-libs/libmpdclient-2.3 media-libs/taglib
-SLOT=0
-SRC_URI=mirror://sourceforge/quimup/quimup_1.4.3_source.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cda9de02192d3372eb88d141bad01467
diff --git a/metadata/md5-cache/media-sound/quimup-1.4.4 b/metadata/md5-cache/media-sound/quimup-1.4.4
index 038954c5b4f5..3a777420a9a9 100644
--- a/metadata/md5-cache/media-sound/quimup-1.4.4
+++ b/metadata/md5-cache/media-sound/quimup-1.4.4
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=me
 DESCRIPTION=Qt5 client for the music player daemon (MPD)
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/quimup/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=media-libs/libmpdclient-2.3 media-libs/taglib
 SLOT=0
 SRC_URI=mirror://sourceforge/quimup/Quimup_1.4.4_source.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4f23884d28e73072290a50e01d7bdadc
+_md5_=10dc5ccae585087e062100480932e63d
diff --git a/metadata/md5-cache/media-sound/strawberry-0.8.2 b/metadata/md5-cache/media-sound/strawberry-0.8.2
new file mode 100644
index 000000000000..e83e4bff7bf2
--- /dev/null
+++ b/metadata/md5-cache/media-sound/strawberry-0.8.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 media-video/vlc sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Modern music player and library organizer based on Clementine and Qt
+EAPI=7
+HOMEPAGE=https://www.strawbs.org/
+IUSE=cdda +dbus debug ipod mms mtp pulseaudio +udisks test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/alsa-lib media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 media-video/vlc sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) pulseaudio? ( media-sound/pulseaudio ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=udisks? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jonaski/strawberry/releases/download/0.8.2/strawberry-0.8.2.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cfefdf8772d3267c7de68f2cfaab4f50
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.7.1-r1 b/metadata/md5-cache/media-sound/yoshimi-1.7.1-r1
deleted file mode 100644
index 7a3be39f7a79..000000000000
--- a/metadata/md5-cache/media-sound/yoshimi-1.7.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/mxml-2.5 media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Software synthesizer based on ZynAddSubFX
-EAPI=7
-HOMEPAGE=https://yoshimi.github.io/
-IUSE=+lv2
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/mxml-2.5 media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
-SLOT=0
-SRC_URI=https://github.com/Yoshimi/yoshimi/archive/1.7.1.tar.gz -> yoshimi-1.7.1.tar.gz
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c9d2ef0543547459c87031b6ce5933a
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.7.2 b/metadata/md5-cache/media-sound/yoshimi-1.7.2
index 94c61b72c0c9..2725484eed30 100644
--- a/metadata/md5-cache/media-sound/yoshimi-1.7.2
+++ b/metadata/md5-cache/media-sound/yoshimi-1.7.2
@@ -5,10 +5,10 @@ DESCRIPTION=Software synthesizer based on ZynAddSubFX
 EAPI=7
 HOMEPAGE=https://yoshimi.github.io/
 IUSE=+lv2
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/mxml-2.5 media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
 SLOT=0
 SRC_URI=https://github.com/Yoshimi/yoshimi/archive/1.7.2.tar.gz -> yoshimi-1.7.2.tar.gz
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b85524812376f3d14163ffaefde64ce8
+_md5_=80f5455099e56e10c53cabe7734185fd
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index c86d0e3eb35b..a882bc421f32 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/ffmpegthumbnailer-2.2.2 b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.2
new file mode 100644
index 000000000000..85adf43bd6cc
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=gtk? ( dev-libs/glib:2= ) jpeg? ( virtual/jpeg:0= ) >=media-video/ffmpeg-2.7:0= png? ( media-libs/libpng:0= )
+DESCRIPTION=Lightweight video thumbnailer that can be used by file managers
+EAPI=7
+HOMEPAGE=https://github.com/dirkvdb/ffmpegthumbnailer
+IUSE=gnome gtk jpeg png test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=gtk? ( dev-libs/glib:2= ) jpeg? ( virtual/jpeg:0= ) >=media-video/ffmpeg-2.7:0= png? ( media-libs/libpng:0= )
+REQUIRED_USE=gnome? ( gtk ) test? ( png jpeg )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.2.2/ffmpegthumbnailer-2.2.2.tar.bz2
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e8943bf134ef6848bd5941c4fb41ab19
diff --git a/metadata/md5-cache/media-video/harvid-0.8.3 b/metadata/md5-cache/media-video/harvid-0.8.3
new file mode 100644
index 000000000000..9d1474a44b9c
--- /dev/null
+++ b/metadata/md5-cache/media-video/harvid-0.8.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=>=media-video/ffmpeg-2.6:0= media-libs/libpng:0= virtual/jpeg:0 virtual/pkgconfig
+DESCRIPTION=HTTP Ardour Video Daemon
+EAPI=7
+HOMEPAGE=http://x42.github.io/harvid/
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=media-video/ffmpeg-2.6:0= media-libs/libpng:0= virtual/jpeg:0
+SLOT=0
+SRC_URI=https://github.com/x42/harvid/archive/v0.8.3.tar.gz -> harvid-0.8.3.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2404966355202653e632cd006804e311
diff --git a/metadata/md5-cache/media-video/mediainfo-20.09 b/metadata/md5-cache/media-video/mediainfo-20.09
new file mode 100644
index 000000000000..4a804de7c2f1
--- /dev/null
+++ b/metadata/md5-cache/media-video/mediainfo-20.09
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-20.09[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) virtual/pkgconfig
+DESCRIPTION=MediaInfo supplies technical and tag information about media files
+EAPI=7
+HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo
+IUSE=curl mms wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-20.09[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
+SLOT=0
+SRC_URI=https://mediaarea.net/download/source/mediainfo/20.09/mediainfo_20.09.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7b356a60d7d14b98d1112fd2affec738
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 4dab09ceb12c..f168350bfc13 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/fragroute-1.2.6-r1 b/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r1
deleted file mode 100644
index 2ae5bf6600c8..000000000000
--- a/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/libevent net-libs/libpcap >=dev-libs/libdnet-1.12[ipv6] virtual/awk
-DESCRIPTION=Testing of network intrusion detection systems, firewalls and TCP/IP stacks
-EAPI=7
-HOMEPAGE=https://github.com/stsi/fragroute-ipv6
-KEYWORDS=~amd64 ~ppc ~ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/libevent net-libs/libpcap >=dev-libs/libdnet-1.12[ipv6]
-SLOT=0
-SRC_URI=https://fragroute-ipv6.googlecode.com/files/fragroute-1.2.6-ipv6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a88935a59eaa083f94b76270307aad71
diff --git a/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r3 b/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r3
deleted file mode 100644
index d18d4204ea56..000000000000
--- a/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/awk >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/libdnet-1.12[ipv6] dev-libs/libevent:= net-libs/libpcap
-DESCRIPTION=Testing of network intrusion detection systems, firewalls and TCP/IP stacks
-EAPI=7
-HOMEPAGE=https://github.com/stsi/fragroute-ipv6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/libdnet-1.12[ipv6] dev-libs/libevent:= net-libs/libpcap
-SLOT=0
-SRC_URI=https://fragroute-ipv6.googlecode.com/files/fragroute-1.2.6-ipv6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ecdfd087b8086ba1ddb2fb4f3e6348f9
diff --git a/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4 b/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4
index 4bb3dd1a3837..226315863e53 100644
--- a/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4
+++ b/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4
@@ -4,10 +4,10 @@ DEPEND=>=dev-libs/libdnet-1.14-r1 dev-libs/libevent:= net-libs/libpcap
 DESCRIPTION=Testing of network intrusion detection systems, firewalls and TCP/IP stacks
 EAPI=7
 HOMEPAGE=https://github.com/stsi/fragroute-ipv6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libdnet-1.14-r1 dev-libs/libevent:= net-libs/libpcap
 SLOT=0
 SRC_URI=https://fragroute-ipv6.googlecode.com/files/fragroute-1.2.6-ipv6.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f1c9702717a745b5fa7b4c4d05eb597c
+_md5_=ce46e1f96c0353ab4e5c67859085f485
diff --git a/metadata/md5-cache/net-analyzer/nessus-bin-8.11.1-r1 b/metadata/md5-cache/net-analyzer/nessus-bin-8.12.0
similarity index 94%
rename from metadata/md5-cache/net-analyzer/nessus-bin-8.11.1-r1
rename to metadata/md5-cache/net-analyzer/nessus-bin-8.12.0
index 2ad72b2bd3ca..54e0ab967dd1 100644
--- a/metadata/md5-cache/net-analyzer/nessus-bin-8.11.1-r1
+++ b/metadata/md5-cache/net-analyzer/nessus-bin-8.12.0
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
-SRC_URI=Nessus-8.11.1-es8.x86_64.rpm
+SRC_URI=Nessus-8.12.0-es8.x86_64.rpm
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	rpm	760ff223c2c4299b68ea901e24c4cabd	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c63bb226ee69de8bd462a4ebedbf401e
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 1c67287ba839..4755476b8ba4 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/tkvoice-1.5 b/metadata/md5-cache/net-dialup/tkvoice-1.5
deleted file mode 100644
index b5224ce9e822..000000000000
--- a/metadata/md5-cache/net-dialup/tkvoice-1.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Voice mail and Fax frontend program
-EAPI=4
-HOMEPAGE=http://tkvoice.netfirms.com
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tk media-libs/netpbm media-sound/sox net-dialup/mgetty
-SLOT=0
-SRC_URI=http://tkvoice.netfirms.com/tkvoice-1.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=37e99d2e940d9241f3655c916f1c86af
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index cd228171c5c2..559f3449a866 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/pdns-recursor-4.3.5 b/metadata/md5-cache/net-dns/pdns-recursor-4.3.5
new file mode 100644
index 000000000000..0f846622fa8f
--- /dev/null
+++ b/metadata/md5-cache/net-dns/pdns-recursor-4.3.5
@@ -0,0 +1,15 @@
+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:= ) dnstap? ( dev-libs/fstrm ) 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=debug dnstap 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:= ) dnstap? ( dev-libs/fstrm ) 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 acct-user/pdns acct-group/pdns
+REQUIRED_USE=dnstap? ( protobuf )
+SLOT=0
+SRC_URI=https://downloads.powerdns.com/releases/pdns-recursor-4.3.5.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e16dabb08d80b9a9daa884cfebfab4a2
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 0ea9159cbdc1..4880836720b0 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/znc-palaver-1.2.1 b/metadata/md5-cache/net-irc/znc-palaver-1.2.1
index 2c4a50528bda..924e2fd75f94 100644
--- a/metadata/md5-cache/net-irc/znc-palaver-1.2.1
+++ b/metadata/md5-cache/net-irc/znc-palaver-1.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=A ZNC module which provides push notifications to Palaver
 EAPI=7
 HOMEPAGE=https://github.com/cocodelabs/znc-palaver
 IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) net-irc/znc:=[ssl]
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cocodelabs/znc-palaver/archive/1.2.1.tar.gz -> znc-palaver-1.2.1.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7018bf4c448f5e0cc43680362cf44edb
+_md5_=b1098428ab1870de418bcb6012524270
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 52c91633750a..1b6670215a75 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/miniupnpc-2.1.20191224 b/metadata/md5-cache/net-libs/miniupnpc-2.1.20191224
index 581f8d3da35a..075e25811453 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.1.20191224
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.1.20191224
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20191224.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpc-2.1.20191224.tar.gz.sig )
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	4069de8c442b579579eb63348d72683f
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	f2f84a35f167f86e5da84a2a2f4f7d65
 _md5_=a1fc4975eeacc04e35a34cc29daafaa1
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index a2b217af0afa..23957e1f3f9b 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/croc-8.4.0 b/metadata/md5-cache/net-misc/croc-8.5.1
similarity index 78%
rename from metadata/md5-cache/net-misc/croc-8.4.0
rename to metadata/md5-cache/net-misc/croc-8.5.1
index 72b7c3e0cbeb..725784acaeda 100644
--- a/metadata/md5-cache/net-misc/croc-8.4.0
+++ b/metadata/md5-cache/net-misc/croc-8.5.1
@@ -1,5 +1,5 @@
 BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
+DEFINED_PHASES=compile install postinst prepare test unpack
 DESCRIPTION=Easily and securely send things from one computer to another
 EAPI=7
 HOMEPAGE=https://github.com/schollz/croc
@@ -8,6 +8,6 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RDEPEND=acct-group/croc acct-user/croc
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/schollz/croc/releases/download/v8.4.0/croc_8.4.0_src.tar.gz -> croc-8.4.0.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.zip -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.mod -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/k0kubun/go-ansi/@v/v0.0.0-20180517002512-3bf9e2903213.mod -> github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.zip -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.mod -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.7.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.zip -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.mod -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.zip -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.mod -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.zip -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.mod -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.4.zip -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.4.mod -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.0.zip -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.0.mod -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/schollz/progressbar/v2/@v/v2.15.0.zip -> github.com%2Fschollz%2Fprogressbar%2Fv2%2F@v%2Fv2.15.0.zip mirror://goproxy//github.com/schollz/progressbar/v2/@v/v2.15.0.mod -> github.com%2Fschollz%2Fprogressbar%2Fv2%2F@v%2Fv2.15.0.mod mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.5.1.zip -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.5.1.zip mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.5.1.mod -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.5.1.mod mirror://goproxy//github.com/schollz/spinner/@v/v0.0.0-20180925172146-6bbc5f7804f9.zip -> github.com%2Fschollz%2Fspinner%2F@v%2Fv0.0.0-20180925172146-6bbc5f7804f9.zip mirror://goproxy//github.com/schollz/spinner/@v/v0.0.0-20180925172146-6bbc5f7804f9.mod -> github.com%2Fschollz%2Fspinner%2F@v%2Fv0.0.0-20180925172146-6bbc5f7804f9.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.zip -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200820211705-5c72a883971a.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200904194848-62affa334b73.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916084744-dbad9cb7cb7a.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916084744-dbad9cb7cb7a.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916084744-dbad9cb7cb7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916084744-dbad9cb7cb7a.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.zip -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.mod -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod
+SRC_URI=https://github.com/schollz/croc/releases/download/v8.5.1/croc_8.5.1_src.tar.gz -> croc-8.5.1.tar.gz mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.zip -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.zip mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.5.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.zip -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/denisbrodbeck/machineid/@v/v1.0.1.mod -> github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/k0kubun/go-ansi/@v/v0.0.0-20180517002512-3bf9e2903213.mod -> github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.zip -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/kalafut/imohash/@v/v1.0.0.mod -> github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.8.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.zip -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.zip mirror://goproxy//github.com/mitchellh/colorstring/@v/v0.0.0-20190213212951-d06e56a500db.mod -> github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.zip -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip mirror://goproxy//github.com/schollz/cli/v2/@v/v2.2.1.mod -> github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.zip -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/schollz/logger/@v/v1.2.0.mod -> github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.zip -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/schollz/mnemonicode/@v/v1.0.1.mod -> github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.4.zip -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.4.zip mirror://goproxy//github.com/schollz/pake/v2/@v/v2.0.4.mod -> github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.0.zip -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/schollz/peerdiscovery/@v/v1.6.0.mod -> github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/schollz/progressbar/v2/@v/v2.15.0.zip -> github.com%2Fschollz%2Fprogressbar%2Fv2%2F@v%2Fv2.15.0.zip mirror://goproxy//github.com/schollz/progressbar/v2/@v/v2.15.0.mod -> github.com%2Fschollz%2Fprogressbar%2Fv2%2F@v%2Fv2.15.0.mod mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.6.0.zip -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.6.0.zip mirror://goproxy//github.com/schollz/progressbar/v3/@v/v3.6.0.mod -> github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.6.0.mod mirror://goproxy//github.com/schollz/spinner/@v/v0.0.0-20180925172146-6bbc5f7804f9.zip -> github.com%2Fschollz%2Fspinner%2F@v%2Fv0.0.0-20180925172146-6bbc5f7804f9.zip mirror://goproxy//github.com/schollz/spinner/@v/v0.0.0-20180925172146-6bbc5f7804f9.mod -> github.com%2Fschollz%2Fspinner%2F@v%2Fv0.0.0-20180925172146-6bbc5f7804f9.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.zip -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/spaolacci/murmur3/@v/v1.1.0.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.zip -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip mirror://goproxy//github.com/tscholl2/siec/@v/v0.0.0-20191122224205-8da93652b094.mod -> github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200604202706-70a84ac30bf9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201012173705-84dcc777aaee.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201012173705-84dcc777aaee.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201012173705-84dcc777aaee.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201012173705-84dcc777aaee.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200707034311-ab3426394381.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201010224723-4f7140c49acb.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201010224723-4f7140c49acb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201013132646-2da7054afaeb.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201013132646-2da7054afaeb.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201013132646-2da7054afaeb.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201013132646-2da7054afaeb.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.zip -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip mirror://goproxy//gopkg.in/tylerb/is.v1/@v/v1.1.2.mod -> gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	go-module	92660621959e7fab813173772987588b	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c7d7acb2fbe5f6bf28cc9a9034aa6b87
+_md5_=5d037307a98dee1534fca50479864d9a
diff --git a/metadata/md5-cache/net-misc/curl-7.72.0 b/metadata/md5-cache/net-misc/curl-7.72.0
index 58b847673ac1..e30ca9846f4d 100644
--- a/metadata/md5-cache/net-misc/curl-7.72.0
+++ b/metadata/md5-cache/net-misc/curl-7.72.0
@@ -5,7 +5,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns alt-svc brotli +ftp gnutls gopher +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
 RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.72.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8fd5c45d581aa30d1c2a4942a25048f0
+_md5_=0354ff8cfdc3bd928d9ee26cb6176072
diff --git a/metadata/md5-cache/net-misc/electrum-4.0.2 b/metadata/md5-cache/net-misc/electrum-4.0.2
index 002582e2d81a..21aad4f1fddb 100644
--- a/metadata/md5-cache/net-misc/electrum-4.0.2
+++ b/metadata/md5-cache/net-misc/electrum-4.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=User friendly Bitcoin client
 EAPI=7
 HOMEPAGE=https://electrum.org/
 IUSE=cli ncurses qrcode +qt5 test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-python/aiorpcX-0.18*[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/attrs-19.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/bitstring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/dnspython-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ecdsa-0.14[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyaes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PySocks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/qrcode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[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(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/protobuf-python-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ncurses? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) ) || ( dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycryptodome[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[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) >=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=|| ( cli ncurses qt5 ) || ( python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spesmilo/electrum/archive/4.0.2.tar.gz -> electrum-4.0.2.gh.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb9c31ee4cbeed0fd1513473c09638d1
+_md5_=892d8752d38b436b85f490f8926d8855
diff --git a/metadata/md5-cache/net-misc/httpie-2.2.0 b/metadata/md5-cache/net-misc/httpie-2.2.0
index b62df9d096fe..5297e9ad925d 100644
--- a/metadata/md5-cache/net-misc/httpie-2.2.0
+++ b/metadata/md5-cache/net-misc/httpie-2.2.0
@@ -5,7 +5,7 @@ DESCRIPTION=Modern command line HTTP client
 EAPI=7
 HOMEPAGE=https://httpie.org/ https://pypi.org/project/httpie/
 IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakubroztocil/httpie/archive/2.2.0.tar.gz -> httpie-2.2.0.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=baa1288ed3e1368656d984e2adef0a3e
+_md5_=60962ddaac5b3c2208c4bb9d91919648
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20200928 b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
index 5c7464759c89..0699d3386094 100644
--- a/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
+++ b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libnfnetlink || ( net-misc/miniupnpd net-libs/miniupnpc )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.5.20200928.tar.gz verify-sig? ( http://miniupnp.free.fr/files/minissdpd-1.5.20200928.tar.gz.sig )
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	4069de8c442b579579eb63348d72683f
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	f2f84a35f167f86e5da84a2a2f4f7d65
 _md5_=50527fbe201e220319258d3da40367a8
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2 b/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
index 245f57d8cb60..7d6d9fce0b9a 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpd-2.2.0-RC2.tar.gz verify-sig? ( http://miniupnp.free.fr/files/miniupnpd-2.2.0-RC2.tar.gz.sig )
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	4069de8c442b579579eb63348d72683f
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	f2f84a35f167f86e5da84a2a2f4f7d65
 _md5_=f6d96e5020680ff508f9d28051bcfc51
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index cf70825826c6..713877e71531 100644
Binary files a/metadata/md5-cache/net-news/Manifest.gz and b/metadata/md5-cache/net-news/Manifest.gz differ
diff --git a/metadata/md5-cache/net-news/quiterss-0.19.3 b/metadata/md5-cache/net-news/quiterss-0.19.3
deleted file mode 100644
index 515494ecf6bd..000000000000
--- a/metadata/md5-cache/net-news/quiterss-0.19.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-db/sqlite-3.11.1:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A Qt-based RSS/Atom feed reader
-EAPI=7
-HOMEPAGE=https://quiterss.org
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=dev-db/sqlite-3.11.1:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
-SLOT=0
-SRC_URI=https://github.com/QuiteRSS/quiterss/archive/0.19.3.tar.gz -> quiterss-0.19.3.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4b8cb1316dff2f409cef030e91ff118
diff --git a/metadata/md5-cache/net-news/quiterss-0.19.4 b/metadata/md5-cache/net-news/quiterss-0.19.4
index 83548990765f..bd1ed44cbb89 100644
--- a/metadata/md5-cache/net-news/quiterss-0.19.4
+++ b/metadata/md5-cache/net-news/quiterss-0.19.4
@@ -4,10 +4,10 @@ DEPEND=>=dev-db/sqlite-3.11.1:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimed
 DESCRIPTION=Qt-based RSS/Atom feed reader
 EAPI=7
 HOMEPAGE=https://quiterss.org
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=dev-db/sqlite-3.11.1:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/QuiteRSS/quiterss/archive/0.19.4.tar.gz -> quiterss-0.19.4.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=16173c2e54a3f31383638ac94c20ef11
+_md5_=d014637a13e97279151b63ef355cc253
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index a7e740726dcd..3a9aada88b89 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.6-r1 b/metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
index 11da1abf125c..9e66c88c1f5d 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.6-r1
@@ -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_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~ppc x86 ~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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) airgraph-ng? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) experimental? ( sys-libs/zlib ) sqlite? ( >=dev-db/sqlite-3.4 )
@@ -13,4 +13,4 @@ REQUIRED_USE=airdrop-ng? ( || ( python_targets_python3_6 python_targets_python3_
 SLOT=0
 SRC_URI=https://download.aircrack-ng.org/aircrack-ng-1.6.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=df7fc5c68a8b7ef772059610271578e4
+_md5_=05c0ee739ea6fcad3852bf1f61c6e66a
diff --git a/metadata/md5-cache/net-wireless/unifi-6.1.19 b/metadata/md5-cache/net-wireless/unifi-6.1.19
new file mode 100644
index 000000000000..a7a24f87f964
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-6.1.19
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=7
+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=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/6.1
+SRC_URI=https://dl.ui.com/unifi/6.1.19-c13306eeee/UniFi.unix.zip -> unifi-6.1.19.zip
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4e222244cbc24d802ba93c4a1e2f3d97
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index f41b3f3b3ab9..5a3253fbd7cb 100644
Binary files a/metadata/md5-cache/ros-meta/Manifest.gz and b/metadata/md5-cache/ros-meta/Manifest.gz differ
diff --git a/metadata/md5-cache/ros-meta/mavros-1.4.0 b/metadata/md5-cache/ros-meta/mavros-1.4.0
new file mode 100644
index 000000000000..793ada5c653a
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/mavros-1.4.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=dev-ros/mavros_msgs dev-ros/libmavconn dev-ros/mavros dev-ros/mavros_extras
+DESCRIPTION=Metapackage for mavros packages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavros
+KEYWORDS=~amd64 ~arm
+LICENSE=metapackage
+RDEPEND=dev-ros/mavros_msgs dev-ros/libmavconn dev-ros/mavros dev-ros/mavros_extras
+SLOT=0
+_md5_=ba14cc4e468836f16afd1bc65340dde3
diff --git a/metadata/md5-cache/ros-meta/rosserial-0.9.1 b/metadata/md5-cache/ros-meta/rosserial-0.9.1
new file mode 100644
index 000000000000..cbdc3c424283
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/rosserial-0.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/catkin[python_targets_python3_8(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/empy[python_targets_python3_8(-)] )
+DESCRIPTION=Metapackage for core of rosserial
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosserial https://github.com/ros-drivers/rosserial
+IUSE=python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_embeddedlinux dev-ros/rosserial_msgs dev-ros/rosserial_python dev-ros/rosserial_server dev-ros/rosserial_tivac dev-ros/rosserial_windows dev-ros/rosserial_xbee python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.9.1.tar.gz -> rosserial-0.9.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	f68348e9f3005ab486c40c57b2265906	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8433dc239eb986468cae0d75a46e8f86
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 5ba382104d84..de620e6cfdc5 100644
Binary files a/metadata/md5-cache/sci-calculators/Manifest.gz and b/metadata/md5-cache/sci-calculators/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-calculators/bc-gh-2.7.2 b/metadata/md5-cache/sci-calculators/bc-gh-2.7.2
deleted file mode 100644
index ef2f89be0f45..000000000000
--- a/metadata/md5-cache/sci-calculators/bc-gh-2.7.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Implementation of POSIX bc with GNU extensions
-EAPI=7
-HOMEPAGE=https://github.com/gavinhoward/bc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/gavinhoward/bc/releases/download/2.7.2/bc-2.7.2.tar.xz
-_md5_=3f7cd6f03afab342f072d3ef51cb87c9
diff --git a/metadata/md5-cache/sci-calculators/bc-gh-3.1.3 b/metadata/md5-cache/sci-calculators/bc-gh-3.1.6
similarity index 94%
rename from metadata/md5-cache/sci-calculators/bc-gh-3.1.3
rename to metadata/md5-cache/sci-calculators/bc-gh-3.1.6
index ca10b6893bc0..387d2d3690ef 100644
--- a/metadata/md5-cache/sci-calculators/bc-gh-3.1.3
+++ b/metadata/md5-cache/sci-calculators/bc-gh-3.1.6
@@ -5,5 +5,5 @@ HOMEPAGE=https://github.com/gavinhoward/bc
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD-2
 SLOT=0
-SRC_URI=https://github.com/gavinhoward/bc/releases/download/3.1.3/bc-3.1.3.tar.xz
+SRC_URI=https://github.com/gavinhoward/bc/releases/download/3.1.6/bc-3.1.6.tar.xz
 _md5_=df26ee06cf5961db4bfc96d99088b8e9
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 5531fabd2275..3111938a9321 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.1-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2020.1-r1
index 352215ff3585..0849939d2e19 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.1-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2020.1
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.1.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2020.1.tar.gz )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5a53ced81507917dd3d0a316508cf03
+_md5_=376c411432376e5936706cb943fdbdfd
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.2 b/metadata/md5-cache/sci-chemistry/gromacs-2020.2
index 3410729477e9..16f4a1b180c2 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.2
@@ -1,15 +1,15 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2020.2
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.2.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2020.2.tar.gz )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5a53ced81507917dd3d0a316508cf03
+_md5_=376c411432376e5936706cb943fdbdfd
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.3 b/metadata/md5-cache/sci-chemistry/gromacs-2020.3
index 531adba20db8..4a7e931408b9 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.3
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.3
@@ -1,15 +1,15 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2020.3
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.3.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2020.3.tar.gz )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5a53ced81507917dd3d0a316508cf03
+_md5_=376c411432376e5936706cb943fdbdfd
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.4 b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
index 3c0fde40a0ec..4a31a90f0586 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.4
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.4
@@ -1,15 +1,15 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2020.4
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.4.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2020.4.tar.gz )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5a53ced81507917dd3d0a316508cf03
+_md5_=376c411432376e5936706cb943fdbdfd
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
index ed013b929ca4..4c41d314032d 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
@@ -1,14 +1,14 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7
+IUSE=X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/2020.9999
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a86848fc709e4d0151040710cdec520
+_md5_=376c411432376e5936706cb943fdbdfd
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index 31598507c872..3a6898d9ed21 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -1,14 +1,14 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7
+IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=493fec40da67ac96271b2e4340e47b49
+_md5_=691dea48ce8ea7430b5a67165ca0b726
diff --git a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4 b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
index 8b1167bc3412..215a79205b47 100644
--- a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
+++ b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.4
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/astor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pandas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytables[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-4.5.0[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(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/astor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytables[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/astor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pandas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytables[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/jupyter_client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/astor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytables[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/jupyter_client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Read, write and analyze MD trajectories with only a few lines of Python code
 EAPI=7
 HOMEPAGE=http://mdtraj.org
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-python/astor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pandas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytables[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/scipy[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(-)] >=dev-python/setuptools-42.0.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 )
+RDEPEND=dev-python/astor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytables[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/mdtraj/mdtraj-1.9.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ae70ed8a9aec9a5ad82f0c3aba93a33
+_md5_=407e11f2f53ac560a1ee704890ef1fd6
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3 b/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3
index eedbf36f4503..53ac953953e5 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3
+++ b/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[opengl,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib
+DEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/PyQt5[opengl,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib
 DESCRIPTION=A Python-extensible molecular graphics system
 EAPI=7
 HOMEPAGE=https://www.pymol.org/
-IUSE=web python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=web python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=PSF-2.2
-RDEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PyQt5[opengl,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib sci-chemistry/chemical-mime-data python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/PyQt5[opengl,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib sci-chemistry/chemical-mime-data python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.3.0.tar.gz -> pymol-2.3.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=203d30efebadd29522ae0f258a656788
+_md5_=b8131a7fa3d5a89dca24e1bd85bb667c
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 5dfdc168caf2..994e8eb50e27 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.6 b/metadata/md5-cache/sci-electronics/kicad-5.1.6
index 9380631bbd3b..0dcf489f11fc 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.6
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.6
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) python? ( >=dev-lang/swig-3.0:0 )
+DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( >=dev-lang/swig-3.0:0 )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=7
 HOMEPAGE=https://www.kicad-pcb.org
-IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) ?? ( occ oce )
+RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sci-electronics/electronics-menu
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/5.1.6/kicad-5.1.6.tar.bz2
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d48c77dafd845e257baff6b312caea91
+_md5_=a045f6c0705512c1a8ed99ef8b7f72c6
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.7 b/metadata/md5-cache/sci-electronics/kicad-5.1.7
index e13e635b9d51..2db43a958b01 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.7
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.7
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) python? ( >=dev-lang/swig-3.0:0 )
+DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) python? ( >=dev-lang/swig-3.0:0 )
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=7
 HOMEPAGE=https://www.kicad-pcb.org
-IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) ?? ( occ oce )
+RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_8(-)] dev-python/wxpython:4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_9(-)] dev-python/wxpython:4.0[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) sci-electronics/electronics-menu
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/5.1.7/kicad-5.1.7.tar.bz2
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0db98876ecd190ab7d4de7dfeeec730
+_md5_=356a673b33292cbc5f7c5295f9203c95
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 9127008a73fd..37e51594d08f 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.10.7 b/metadata/md5-cache/sci-geosciences/qgis-3.10.7
deleted file mode 100644
index 7e556f0fbfb5..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-3.10.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/linguist-tools-5.9.4:5 sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-6.3.1:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/httplib2[python_targets_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)] dev-python/owslib[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/sip:=[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] dev-python/jinja[python_targets_python3_7(-)] dev-python/markupsafe[python_targets_python3_7(-)] dev-python/owslib[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] dev-python/pytz[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/sip:=[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] dev-python/jinja[python_targets_python3_8(-)] dev-python/markupsafe[python_targets_python3_8(-)] dev-python/owslib[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_8(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/qttest-5.9.4:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=User friendly Geographic Information System
-EAPI=7
-HOMEPAGE=https://www.qgis.org/
-IUSE=3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-6.3.1:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/httplib2[python_targets_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)] dev-python/owslib[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/sip:=[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] dev-python/jinja[python_targets_python3_7(-)] dev-python/markupsafe[python_targets_python3_7(-)] dev-python/owslib[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] dev-python/pytz[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/sip:=[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] dev-python/jinja[python_targets_python3_8(-)] dev-python/markupsafe[python_targets_python3_8(-)] dev-python/owslib[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_8(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) mapserver? ( python )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://qgis.org/downloads/qgis-3.10.7.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3289275cba3662616c2f584c0bb96ec3
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.10.9 b/metadata/md5-cache/sci-geosciences/qgis-3.10.9
index b6ce1dad7d09..8f2b892af514 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.10.9
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.10.9
@@ -5,7 +5,7 @@ DESCRIPTION=User friendly Geographic Information System
 EAPI=7
 HOMEPAGE=https://www.qgis.org/
 IUSE=3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-6.3.1:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/httplib2[python_targets_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)] dev-python/owslib[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/sip:=[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] dev-python/jinja[python_targets_python3_7(-)] dev-python/markupsafe[python_targets_python3_7(-)] dev-python/owslib[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] dev-python/pytz[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/sip:=[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/httplib2[python_targets_python3_8(-)] dev-python/jinja[python_targets_python3_8(-)] dev-python/markupsafe[python_targets_python3_8(-)] dev-python/owslib[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_8(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) mapserver? ( python )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.10.9.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
 _eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c959f9087f5c3f4f7d3c37afd9bf2f5a
+_md5_=3289275cba3662616c2f584c0bb96ec3
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index ab6bbb6639db..d4f6eb65d150 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/libint-2.6.0 b/metadata/md5-cache/sci-libs/libint-2.6.0
index 369871ff2afd..ad4f31f85022 100644
--- a/metadata/md5-cache/sci-libs/libint-2.6.0
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0
@@ -5,10 +5,10 @@ DESCRIPTION=Matrix elements (integrals) evaluation over Cartesian Gaussian funct
 EAPI=7
 HOMEPAGE=https://github.com/evaleev/libint
 IUSE=static-libs doc
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/fortran
 SLOT=2
 SRC_URI=https://github.com/evaleev/libint/archive/v2.6.0.tar.gz -> libint-2.6.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b6b7bf00488f49c6dd9f05a49bd52b2
+_md5_=6362fc5e8321bba0d88b15dd2200d3c7
diff --git a/metadata/md5-cache/sci-libs/libint-2.6.0-r1 b/metadata/md5-cache/sci-libs/libint-2.6.0-r1
new file mode 100644
index 000000000000..f39f14be8732
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libint-2.6.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/boost dev-libs/gmp[cxx] doc? ( dev-texlive/texlive-latex dev-tex/latex2html ) virtual/fortran
+DESCRIPTION=Matrix elements (integrals) evaluation over Cartesian Gaussian functions
+EAPI=7
+HOMEPAGE=https://github.com/evaleev/libint
+IUSE=static-libs doc
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=virtual/fortran
+SLOT=2
+SRC_URI=https://github.com/evaleev/libint/archive/v2.6.0.tar.gz -> libint-2.6.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1a7c70b4f845db98cbfef368801c3790
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 7c1b3e6fcf4a..43925c856117 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.12.0 b/metadata/md5-cache/sci-mathematics/coq-8.12.0
new file mode 100644
index 000000000000..2e586de8f2d8
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/coq-8.12.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-lang/ocaml-4.11.0:=[ocamlopt?] dev-ml/camlp5:=[ocamlopt?] dev-ml/num:= gtk? ( dev-ml/lablgtk:3=[sourceview,ocamlopt?] dev-ml/lablgtk-sourceview:3=[ocamlopt?] ) dev-ml/findlib doc? ( media-libs/netpbm[png,zlib] virtual/latex-base dev-tex/hevea dev-texlive/texlive-latexrecommended dev-texlive/texlive-pictures dev-texlive/texlive-mathscience dev-texlive/texlive-latexextra )
+DESCRIPTION=Proof assistant written in O'Caml
+EAPI=7
+HOMEPAGE=http://coq.inria.fr/
+IUSE=gtk debug +ocamlopt doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/ocaml-4.11.0:=[ocamlopt?] dev-ml/camlp5:=[ocamlopt?] dev-ml/num:= gtk? ( dev-ml/lablgtk:3=[sourceview,ocamlopt?] dev-ml/lablgtk-sourceview:3=[ocamlopt?] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/coq/coq/archive/V8.12.0.tar.gz -> coq-8.12.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f94d533340503ac45a65dbb2cca70f6c
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.3.6 b/metadata/md5-cache/sci-mathematics/gimps-30.3.6
new file mode 100644
index 000000000000..03cde90f4898
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/gimps-30.3.6
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=The Great Internet Mersenne Prime Search
+EAPI=7
+HOMEPAGE=https://www.mersenne.org/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GIMPS
+RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v303b6.linux64.tar.gz ) x86? ( https://www.mersenne.org/ftp_root/gimps/p95v303b6.linux32.tar.gz )
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=689caf65eb52513e4bb3904fd1087167
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 7137c348c4aa..49f37d83379f 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.2 b/metadata/md5-cache/sci-visualization/veusz-3.2
index c41a9d6ba610..d1f5ca1ed68e 100644
--- a/metadata/md5-cache/sci-visualization/veusz-3.2
+++ b/metadata/md5-cache/sci-visualization/veusz-3.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Qt scientific plotting package with good Postscript output
 EAPI=7
 HOMEPAGE=https://veusz.github.io/
-IUSE=dbus doc hdf5 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
+IUSE=dbus doc hdf5 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) hdf5? ( dev-python/h5py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) hdf5? ( dev-python/h5py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/veusz/veusz/releases/download/veusz-3.2/veusz-3.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11cb53c82310655745d570c5dbeb4df8
+_md5_=3cfa1377bbdd51c24c9862b69105ff48
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b5ba74798e5a..2a511b908693 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/dtc-1.6.0 b/metadata/md5-cache/sys-apps/dtc-1.6.0
index 74eefffb5fe1..4c074c9bc10c 100644
--- a/metadata/md5-cache/sys-apps/dtc-1.6.0
+++ b/metadata/md5-cache/sys-apps/dtc-1.6.0
@@ -5,10 +5,10 @@ DESCRIPTION=Open Firmware device tree compiler
 EAPI=7
 HOMEPAGE=https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
 IUSE=static-libs yaml
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=yaml? ( dev-libs/libyaml )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/dtc/dtc-1.6.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=103b24db993b3e2df2d2d20439b80786
+_md5_=ba4b2b2dd62fbfb73379ea6965aa147f
diff --git a/metadata/md5-cache/sys-apps/hw-probe-1.5-r1 b/metadata/md5-cache/sys-apps/hw-probe-1.5-r1
index bbf8844200c2..d88a25b480c0 100644
--- a/metadata/md5-cache/sys-apps/hw-probe-1.5-r1
+++ b/metadata/md5-cache/sys-apps/hw-probe-1.5-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst
 DESCRIPTION=A tool to probe for hardware, check it's operability and find drivers
 EAPI=7
 HOMEPAGE=https://github.com/linuxhw/hw-probe/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-lang/perl dev-perl/Digest-SHA1 net-misc/curl sys-apps/dmidecode sys-apps/edid-decode sys-apps/hwinfo sys-apps/pciutils sys-apps/smartmontools sys-apps/usbutils virtual/perl-Data-Dumper
 SLOT=0
 SRC_URI=https://github.com/linuxhw/hw-probe/archive/1.5.tar.gz -> hw-probe-1.5.tar.gz
 _eclasses_=optfeature	6c9aa35fc16df43d7142ef2660e00e25	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=1f3640d5b03761fff0542ea8d783e535
+_md5_=58da55ccb131eabf19c38e4b5ca86d3b
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 19c84d657b05..934fd5c54e23 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/pambase-20200917 b/metadata/md5-cache/sys-auth/pambase-20200917
deleted file mode 100644
index eb9b1d955b2f..000000000000
--- a/metadata/md5-cache/sys-auth/pambase-20200917
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.9 dev-python/jinja[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/jinja[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/jinja[python_targets_python3_7(-),python_single_target_python3_7(+)] ) )
-DEFINED_PHASES=configure install postinst setup test
-DESCRIPTION=PAM base configuration files
-EAPI=7
-HOMEPAGE=https://github.com/gentoo/pambase
-IUSE=caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/pam-1.4.0 elogind? ( sys-auth/elogind[pam] ) gnome-keyring? ( gnome-base/gnome-keyring[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( >=sys-libs/pam-1.4.0 sys-auth/pam_krb5 ) caps? ( sys-libs/libcap[pam] ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 ) pwquality? ( dev-libs/libpwquality[pam] ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.4.0 ) systemd? ( sys-apps/systemd[pam] )
-REQUIRED_USE=?? ( elogind systemd ) ?? ( passwdqc pwquality ) pwhistory? ( || ( passwdqc pwquality ) )
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=https://github.com/gentoo/pambase/archive/pambase-20200917.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=79063b011fd59c1de591d3d2e41f1926
diff --git a/metadata/md5-cache/sys-auth/pambase-20201010 b/metadata/md5-cache/sys-auth/pambase-20201013
similarity index 99%
rename from metadata/md5-cache/sys-auth/pambase-20201010
rename to metadata/md5-cache/sys-auth/pambase-20201013
index d64146c9850b..a86a6c23bfbe 100644
--- a/metadata/md5-cache/sys-auth/pambase-20201010
+++ b/metadata/md5-cache/sys-auth/pambase-20201013
@@ -10,6 +10,6 @@ RDEPEND=>=sys-libs/pam-1.4.0 elogind? ( sys-auth/elogind[pam] ) gnome-keyring? (
 REQUIRED_USE=?? ( elogind systemd ) ?? ( passwdqc pwquality ) pwhistory? ( || ( passwdqc pwquality ) )
 RESTRICT=binchecks
 SLOT=0
-SRC_URI=https://github.com/gentoo/pambase/archive/pambase-20201010.tar.gz
+SRC_URI=https://github.com/gentoo/pambase/archive/pambase-20201013.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=79063b011fd59c1de591d3d2e41f1926
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index d2f9e5e7177d..9e79adddc126 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r3 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r3
index 822e6fa4d08f..984f388b93d9 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r3
@@ -5,7 +5,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite cilk ada +vtv jit mpx +pie +ssp +pch
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= graphite? ( >=dev-libs/isl-0.14:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=6.5.0
 SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-5.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	95b9d37e17621738d2113a52fb4f59dd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f414cd713c37eb8a2e23cb7c5a0d1f13
+_md5_=b2ec83ec77003d2a6717241f6e221a81
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.3.2 b/metadata/md5-cache/sys-devel/gcc-config-2.3.2
index 9151c4867125..a65b037254bd 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-2.3.2
+++ b/metadata/md5-cache/sys-devel/gcc-config-2.3.2
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to manage compilers
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
 IUSE=+native-symlinks
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/gcc-config-2.3.2.tar.xz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a6fab4266896b8f2ceccebcbb1c129ff
+_md5_=518ff03ecf10cc9097f67b491f739091
diff --git a/metadata/md5-cache/sys-devel/gdb-9.2 b/metadata/md5-cache/sys-devel/gdb-9.2
index c66ce138bcd9..05f58eea6452 100644
--- a/metadata/md5-cache/sys-devel/gdb-9.2
+++ b/metadata/md5-cache/sys-devel/gdb-9.2
@@ -5,7 +5,7 @@ DESCRIPTION=GNU debugger
 EAPI=7
 HOMEPAGE=https://sourceware.org/gdb/
 IUSE=+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) || ( client server )
@@ -13,4 +13,4 @@ RESTRICT=hppa? ( test ) ia64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-9.2.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-9.2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f7230359a0ab1fa1fb60f609b6afda5f
+_md5_=9c669b99a0d5112d99220340b343a209
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index f004a943c35d..2b723f495e4a 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-202008 b/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
index 4fbd409e67b3..53a28d4ac1ae 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-202008
@@ -4,10 +4,10 @@ DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=7
 HOMEPAGE=https://github.com/tianocore/edk2
 IUSE=+binary
-KEYWORDS=~amd64 arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm64 ~ppc ~ppc64 x86
 LICENSE=BSD-2 MIT
 REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable202008.tar.gz -> edk2-ovmf-202008.tar.gz https://github.com/openssl/openssl/archive/e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz -> openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) binary? ( https://dev.gentoo.org/~mva/distfiles/edk2-ovmf-202008-bin.tar.xz ) https://dev.gentoo.org/~mva/distfiles/edk2-ovmf-202008-qemu-firmware.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=86f3fe7f80981332c02fbde18ecd7c5b
+_md5_=ba6ee3c88c00afb7c4b15422d124de93
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index e43e7fb0a2eb..30cff6518411 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.0 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.0
new file mode 100644
index 000000000000..f3def30f0eec
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.9.0
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.9.0 !sys-kernel/vanilla-kernel-bin:5.9.0 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.9.0
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-1.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.9.0 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.9.0 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.9.0 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/aa6d9438d030fa4682d5d450481085c901503da5/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.9.0 )
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2dd6e37137e6001df6ab30535126da92
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.0 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.0
new file mode 100644
index 000000000000..1b66b646be1b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.0
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.9.0 !sys-kernel/vanilla-kernel:5.9.0 !sys-kernel/vanilla-kernel-bin:5.9.0 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.9.0
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.0-1.xpak -> gentoo-kernel-5.9.0-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.0-1.xpak -> gentoo-kernel-5.9.0-1.x86.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.0-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.0-r1
new file mode 100644
index 000000000000..d01101fa6d47
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.9.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.9.0 !sys-kernel/vanilla-kernel:5.9.0 !sys-kernel/vanilla-kernel-bin:5.9.0 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.9.0
+SRC_URI=arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.0-1.xpak -> gentoo-kernel-5.9.0-1.arm64.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1c986217f742976ad581aba3fa686aaa
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p8 b/metadata/md5-cache/sys-kernel/pf-sources-5.6_p8
deleted file mode 100644
index 0b91165d2d7c..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.6_p8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=6
-HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.6_p8
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.6...v5.6-pf8.diff -> pf-sources-5.6_p8.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.6-2.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=29ef281426c289e336261ea4a444c054
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.7_p5 b/metadata/md5-cache/sys-kernel/pf-sources-5.7_p5
deleted file mode 100644
index b96a4adf0873..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.7_p5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=6
-HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.7_p5
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.7...v5.7-pf5.diff -> pf-sources-5.7_p5.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.7-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.7-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=81909829d73580edff12101160a473b2
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p1 b/metadata/md5-cache/sys-kernel/pf-sources-5.8_p1
deleted file mode 100644
index 5aa3cb7e6824..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=6
-HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8_p1
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.8...v5.8-pf1.diff -> pf-sources-5.8_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=81909829d73580edff12101160a473b2
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.8_p3
deleted file mode 100644
index 449bd2991e88..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=6
-HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8_p3
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.8...v5.8-pf3.diff -> pf-sources-5.8_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=81909829d73580edff12101160a473b2
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.8_p4
deleted file mode 100644
index 77212cf73b2b..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=6
-HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8_p4
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.8...v5.8-pf4.diff -> pf-sources-5.8_p4.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=81909829d73580edff12101160a473b2
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p5 b/metadata/md5-cache/sys-kernel/pf-sources-5.8_p5
deleted file mode 100644
index ce86d5d89ba4..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=6
-HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8_p5
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.8...v5.8-pf5.diff -> pf-sources-5.8_p5.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=81909829d73580edff12101160a473b2
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p6 b/metadata/md5-cache/sys-kernel/pf-sources-5.8_p6
deleted file mode 100644
index 9aa0165d9177..000000000000
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
-EAPI=6
-HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
-IUSE=symlink build
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8_p6
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.8...v5.8-pf6.diff -> pf-sources-5.8_p6.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.extras.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=81909829d73580edff12101160a473b2
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.9_p1
similarity index 73%
rename from metadata/md5-cache/sys-kernel/pf-sources-5.8_p2
rename to metadata/md5-cache/sys-kernel/pf-sources-5.9_p1
index 3e2efb40b52a..d19da2c04331 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.9_p1
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.8_p2
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.8...v5.8-pf2.diff -> pf-sources-5.8_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.extras.tar.xz
+SLOT=5.9_p1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.9...v5.9-pf1.diff -> pf-sources-5.9_p1.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.9-1.extras.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=81909829d73580edff12101160a473b2
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.57_p20190709 b/metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.51_p20200902
similarity index 56%
rename from metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.57_p20190709
rename to metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.51_p20200902
index d18744d3d0f2..a1a159aca26d 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.57_p20190709
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-5.4.51_p20200902
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm preinst prerm pretend
 DESCRIPTION=Raspberry Pi (all versions) kernel and modules
 EAPI=7
 HOMEPAGE=https://github.com/raspberrypi/firmware
-KEYWORDS=-* ~arm
+KEYWORDS=-* ~arm ~arm64
 LICENSE=GPL-2 raspberrypi-videocore-bin
-RDEPEND=sys-boot/raspberrypi-firmware
+RDEPEND=>sys-boot/raspberrypi-firmware-1.20190709
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20190709.tar.gz -> raspberrypi-firmware-1.20190709.tar.gz
+SRC_URI=https://github.com/raspberrypi/firmware/archive/1.20200902.tar.gz -> raspberrypi-firmware-1.20200902.tar.gz
 _eclasses_=mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
-_md5_=6e83a6794c0d1ea1b51890c67e06d8dd
+_md5_=aaef5312583ce74dc9e0e4051b063ffb
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 9543dab9cdd6..d18597772e44 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/opera-developer-73.0.3841.0 b/metadata/md5-cache/www-client/opera-developer-73.0.3841.0
new file mode 100644
index 000000000000..eb07173a6556
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-73.0.3841.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/wayland 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/libxkbcommon x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/73.0.3841.0/linux/opera-developer_73.0.3841.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/73.0.3841.0/linux/opera-developer_73.0.3841.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/73.0.3841.0/linux/opera-developer_73.0.3841.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/73.0.3841.0/linux/opera-developer_73.0.3841.0_amd64.deb )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=08350325917c4d9010f7f3229d21d7bb
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2059.2_p1 b/metadata/md5-cache/www-client/vivaldi-3.4.2066.65_p1
similarity index 77%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2059.2_p1
rename to metadata/md5-cache/www-client/vivaldi-3.4.2066.65_p1
index 3f36a500993d..26785c82a9d2 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2059.2_p1
+++ b/metadata/md5-cache/www-client/vivaldi-3.4.2066.65_p1
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2059.2-1_amd64.deb -> vivaldi-snapshot-3.4.2059.2_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2059.2-1_arm64.deb -> vivaldi-snapshot-3.4.2059.2_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2059.2-1_armhf.deb -> vivaldi-snapshot-3.4.2059.2_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2059.2-1_i386.deb -> vivaldi-snapshot-3.4.2059.2_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.65-1_amd64.deb -> vivaldi-3.4.2066.65_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.65-1_arm64.deb -> vivaldi-3.4.2066.65_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.65-1_armhf.deb -> vivaldi-3.4.2066.65_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.65-1_i386.deb -> vivaldi-3.4.2066.65_p1-i386.deb )
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b6850c0cd923015cdb28366a21fd330
+_md5_=166bc12e277fc6d103525dfeb92bf2b0
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2064.6_p1 b/metadata/md5-cache/www-client/vivaldi-3.4.2066.72_p1
similarity index 77%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2064.6_p1
rename to metadata/md5-cache/www-client/vivaldi-3.4.2066.72_p1
index a49ff660f79a..d10ff380fd97 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2064.6_p1
+++ b/metadata/md5-cache/www-client/vivaldi-3.4.2066.72_p1
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2064.6-1_amd64.deb -> vivaldi-snapshot-3.4.2064.6_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2064.6-1_arm64.deb -> vivaldi-snapshot-3.4.2064.6_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2064.6-1_armhf.deb -> vivaldi-snapshot-3.4.2064.6_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2064.6-1_i386.deb -> vivaldi-snapshot-3.4.2064.6_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.72-1_amd64.deb -> vivaldi-3.4.2066.72_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.72-1_arm64.deb -> vivaldi-3.4.2066.72_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.72-1_armhf.deb -> vivaldi-3.4.2066.72_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.4.2066.72-1_i386.deb -> vivaldi-3.4.2066.72_p1-i386.deb )
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b6850c0cd923015cdb28366a21fd330
+_md5_=166bc12e277fc6d103525dfeb92bf2b0
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2035.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2035.3_p1
deleted file mode 100644
index 61e64284a0b0..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2035.3_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_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +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_gd +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 ~arm64 ~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/snapshot/vivaldi-snapshot_3.4.2035.3-1_amd64.deb -> vivaldi-snapshot-3.4.2035.3_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2035.3-1_arm64.deb -> vivaldi-snapshot-3.4.2035.3_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2035.3-1_armhf.deb -> vivaldi-snapshot-3.4.2035.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2035.3-1_i386.deb -> vivaldi-snapshot-3.4.2035.3_p1-i386.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2036.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2036.3_p1
deleted file mode 100644
index 8cd38e34bc56..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2036.3_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_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +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_gd +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 ~arm64 ~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/snapshot/vivaldi-snapshot_3.4.2036.3-1_amd64.deb -> vivaldi-snapshot-3.4.2036.3_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2036.3-1_arm64.deb -> vivaldi-snapshot-3.4.2036.3_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2036.3-1_armhf.deb -> vivaldi-snapshot-3.4.2036.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2036.3-1_i386.deb -> vivaldi-snapshot-3.4.2036.3_p1-i386.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2038.4_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2038.4_p1
deleted file mode 100644
index a16a4be08c47..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2038.4_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_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +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_gd +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 ~arm64 ~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/snapshot/vivaldi-snapshot_3.4.2038.4-1_amd64.deb -> vivaldi-snapshot-3.4.2038.4_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2038.4-1_arm64.deb -> vivaldi-snapshot-3.4.2038.4_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2038.4-1_armhf.deb -> vivaldi-snapshot-3.4.2038.4_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2038.4-1_i386.deb -> vivaldi-snapshot-3.4.2038.4_p1-i386.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2056.19_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.64_p1
similarity index 83%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2056.19_p1
rename to metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.64_p1
index 4720cda607e6..c89deb1f942b 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2056.19_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.64_p1
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2056.19-1_amd64.deb -> vivaldi-snapshot-3.4.2056.19_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2056.19-1_arm64.deb -> vivaldi-snapshot-3.4.2056.19_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2056.19-1_armhf.deb -> vivaldi-snapshot-3.4.2056.19_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2056.19-1_i386.deb -> vivaldi-snapshot-3.4.2056.19_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.64-1_amd64.deb -> vivaldi-snapshot-3.4.2066.64_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.64-1_arm64.deb -> vivaldi-snapshot-3.4.2066.64_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.64-1_armhf.deb -> vivaldi-snapshot-3.4.2066.64_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.64-1_i386.deb -> vivaldi-snapshot-3.4.2066.64_p1-i386.deb )
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b6850c0cd923015cdb28366a21fd330
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2049.2_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.70_p1
similarity index 80%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2049.2_p1
rename to metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.70_p1
index 8e32ea0febda..b35f39b029e4 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2049.2_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2066.70_p1
@@ -9,6 +9,6 @@ LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2049.2-1_amd64.deb -> vivaldi-snapshot-3.4.2049.2_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2049.2-1_arm64.deb -> vivaldi-snapshot-3.4.2049.2_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2049.2-1_armhf.deb -> vivaldi-snapshot-3.4.2049.2_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2049.2-1_i386.deb -> vivaldi-snapshot-3.4.2049.2_p1-i386.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.70-1_amd64.deb -> vivaldi-snapshot-3.4.2066.70_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.70-1_arm64.deb -> vivaldi-snapshot-3.4.2066.70_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.70-1_armhf.deb -> vivaldi-snapshot-3.4.2066.70_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2066.70-1_i386.deb -> vivaldi-snapshot-3.4.2066.70_p1-i386.deb )
 _eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b6850c0cd923015cdb28366a21fd330
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index dbaaca0f499a..6acdb58f1cc9 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.433 b/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.445
similarity index 89%
rename from metadata/md5-cache/www-plugins/adobe-flash-32.0.0.433
rename to metadata/md5-cache/www-plugins/adobe-flash-32.0.0.445
index eef773c034d5..443a15e49f3e 100644
--- a/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.433
+++ b/metadata/md5-cache/www-plugins/adobe-flash-32.0.0.445
@@ -10,6 +10,6 @@ RDEPEND=!www-plugins/chrome-binary-plugins[flash(-)] nsplugin? ( dev-libs/atk[ab
 REQUIRED_USE=|| ( nsplugin ppapi )
 RESTRICT=bindist mirror strip
 SLOT=22
-SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.433/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-32.0.0.433-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.433/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.433-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.433/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-32.0.0.433-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.433/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.433-ppapi.x86_64.tar.gz ) )
+SRC_URI=nsplugin? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.445/flash_player_npapi_linux.i386.tar.gz -> adobe-flash-32.0.0.445-npapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.445/flash_player_npapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.445-npapi.x86_64.tar.gz ) ) ppapi? ( abi_x86_32? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.445/flash_player_ppapi_linux.i386.tar.gz -> adobe-flash-32.0.0.445-ppapi.i386.tar.gz ) abi_x86_64? ( https://fpdownload.adobe.com/pub/flashplayer/pdc/32.0.0.445/flash_player_ppapi_linux.x86_64.tar.gz -> adobe-flash-32.0.0.445-ppapi.x86_64.tar.gz ) )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b9c9837c1f6d7c3ba8d05edf0467e6e7
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 6895f09fb3e3..ee2e928943c3 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/nginx-unit-1.18.0 b/metadata/md5-cache/www-servers/nginx-unit-1.18.0
index 09ac71c232da..f8e712a6513b 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.18.0
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.18.0
@@ -4,11 +4,11 @@ DESCRIPTION=Dynamic web and application server
 EAPI=7
 HOMEPAGE=https://unit.nginx.org
 IUSE=perl python ruby php7-2 php7-3 php7-4 ssl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=perl? ( dev-lang/perl:= ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) php7-4? ( dev-lang/php:7.4[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
 REQUIRED_USE=|| ( perl python ruby php7-2 php7-3 php7-4 ssl ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.18.0.tar.gz -> nginx-unit-1.18.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b2927c11842fd6221530e84c8ac43ccb
+_md5_=e4f428e78cd14b00fe56013e0c382540
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index e09aa6b3f8aa..64bede354d04 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/xlockmore-5.66_alpha12 b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha12
new file mode 100644
index 000000000000..b09e4a69e027
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha12
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=Just another screensaver application for X
+EAPI=7
+HOMEPAGE=https://www.sillycycle.com/xlockmore.html
+IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
+REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
+SLOT=0
+SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.66ALPHA12.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66ALPHA12.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a1dc4376a63da7fbdf8a2f4a30e88c44
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.3 b/metadata/md5-cache/x11-misc/zim-0.73.3
new file mode 100644
index 000000000000..007c78d3356d
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.73.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils
+DESCRIPTION=A desktop wiki
+EAPI=7
+HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-wiki
+IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.3.tar.gz -> zim-0.73.3.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=387d320c691599bef154ac59f16a7f4a
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index f51b9d9a8cd7..c086cfe7bd85 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/xpra-3.0.5-r1 b/metadata/md5-cache/x11-wm/xpra-3.0.5-r1
index 0f32555f9442..0adb564c4a65 100644
--- a/metadata/md5-cache/x11-wm/xpra-3.0.5-r1
+++ b/metadata/md5-cache/x11-wm/xpra-3.0.5-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pyopengl ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) virtual/pkgconfig >=dev-python/cython-0.16[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pyopengl ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) virtual/pkgconfig >=dev-python/cython-0.16[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-util/desktop-file-utils x11-misc/shared-mime-info python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
 EAPI=6
 HOMEPAGE=http://xpra.org/ http://xpra.org/src/
-IUSE=+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pyopengl ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) dev-python/netifaces[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/rencode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[jpeg?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/ssh x11-apps/xmodmap cups? ( dev-python/pycups[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) lz4? ( dev-python/lz4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) webcam? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-libs/opencv[python] dev-python/pyinotify[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) || ( client server ) cups? ( dbus ) opengl? ( client ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxkbfile csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pyopengl ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) dev-python/netifaces[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/rencode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[jpeg?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/ssh x11-apps/xmodmap cups? ( dev-python/pycups[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) lz4? ( dev-python/lz4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) webcam? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-libs/opencv[python] dev-python/pyinotify[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( client server ) cups? ( dbus ) opengl? ( client ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-3.0.5.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0621ef57fb10a91d5f1c17b163783ad0
+_md5_=ecb3112604f62838809d2b1b9616b345
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c1942aa29c96..9eff2c63364d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 13 Oct 2020 09:08:22 +0000
+Wed, 14 Oct 2020 13:08:26 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 8236a97977e8..6b3efca85066 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue 13 Oct 2020 09:08:22 AM UTC
+Wed 14 Oct 2020 01:08:25 PM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8f29281fee3d..78dab71f124d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 13 Oct 2020 09:30:01 +0000
+Wed, 14 Oct 2020 13:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 106a4cb9e8d7..d16ef5762426 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-eb5cb74c880d460faf36db7a3204d04800b7c326 1602579684 2020-10-13T09:01:24+00:00
+e56f0515c431be5afc6c54b7b929146ed4ff4827 1602680337 2020-10-14T12:58:57+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 02129dfb6b58..69e5cdf4d6af 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1602579901 Tue 13 Oct 2020 09:05:01 AM UTC
+1602680701 Wed 14 Oct 2020 01:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c1942aa29c96..74d7bbcadf47 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 13 Oct 2020 09:08:22 +0000
+Wed, 14 Oct 2020 13:08:25 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 8354b6cb10aa..af783d61af6b 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r1.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r1.ebuild
deleted file mode 100644
index 53aaa81ffc3d..000000000000
--- a/net-analyzer/fragroute/fragroute-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P}-ipv6"
-
-inherit autotools
-
-DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks"
-HOMEPAGE="https://github.com/stsi/fragroute-ipv6"
-SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
-
-RDEPEND="
-	dev-libs/libevent
-	net-libs/libpcap
-	>=dev-libs/libdnet-1.12[ipv6]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/awk
-"
-DOCS=( INSTALL README TODO )
-PATCHES=(
-	"${FILESDIR}"/${P}-pcap_open.patch
-)
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	# Remove broken and old files, autotools will regen needed files
-	rm *.m4 acconfig.h missing Makefile.in || die
-	# Add missing includes
-	sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-libdnet="${EPREFIX}"/usr \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-libpcap="${EPREFIX}"/usr
-}
diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r3.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r3.ebuild
deleted file mode 100644
index 60b3c08bfca8..000000000000
--- a/net-analyzer/fragroute/fragroute-1.2.6-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P}-ipv6"
-
-inherit autotools
-
-DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks"
-HOMEPAGE="https://github.com/stsi/fragroute-ipv6"
-SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-libs/libdnet-1.12[ipv6]
-	dev-libs/libevent:=
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/awk
-"
-DOCS=( INSTALL README TODO )
-PATCHES=(
-	"${FILESDIR}"/${P}-libdir.patch
-	"${FILESDIR}"/${P}-pcap_open.patch
-)
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Remove broken and old files, autotools will regen needed files
-	rm *.m4 acconfig.h missing Makefile.in || die
-
-	# Add missing includes
-	sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		DNETINC='' \
-		DNETLIB=-ldnet \
-		EVENTINC='' \
-		EVENTLIB=-levent \
-		PCAPINC='' \
-		PCAPLIB=-lpcap
-}
diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
index 58e9d754203b..4c90ad1ec6dd 100644
--- a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
+++ b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-libs/libdnet-1.14-r1
diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest
index 97074a82281a..8d09195b5c76 100644
--- a/net-analyzer/nessus-bin/Manifest
+++ b/net-analyzer/nessus-bin/Manifest
@@ -1 +1 @@
-DIST Nessus-8.11.1-es8.x86_64.rpm 38880588 BLAKE2B 36a611cb545caaf242a9fd7a5c6d305856281d78ed6a0c52bf2624f78163e47eb1e11467dd413e103446ed5b76aa101e45bef82fb9e2526ed06465b7615b9b45 SHA512 838aa45373b2c03616e89b2a0caf5f6a65fe552a067906e05a6e2ff60dafcb08c6f2d9bc5cd17fe88fc46de465d963d218cf28698c93ad14da43a5ea75f789bf
+DIST Nessus-8.12.0-es8.x86_64.rpm 39848644 BLAKE2B 33b9f8afd9affb2cf168d8c8a70c2470af878e1384ba5338f2d2a9ff27d64c5503bac044fb1ab216e22b75e8f7f18918ec599d3b461d80fcde680707dfe3a04d SHA512 a3bfce202a38d84f616e57f3091b7d691499bf0a1d1a92cd5f7ca2e97ddc59a212eee58c321abe41c0589b6ba2fd7d992f98c129991218ac9c1b816037846b24
diff --git a/net-analyzer/nessus-bin/nessus-bin-8.11.1-r1.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.12.0.ebuild
similarity index 100%
rename from net-analyzer/nessus-bin/nessus-bin-8.11.1-r1.ebuild
rename to net-analyzer/nessus-bin/nessus-bin-8.12.0.ebuild
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 86816116d9fc..16f56b8c8770 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/tkvoice/Manifest b/net-dialup/tkvoice/Manifest
deleted file mode 100644
index 4426686bb856..000000000000
--- a/net-dialup/tkvoice/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tkvoice-1.5.tar.gz 153967 BLAKE2B a9c1a5b61e765bc16c881b21c05e0c76ee372219fb01605ec11c66290e1325b50e973cbf7ef6fe392f88967f82e301e45786913c4f2028192f264f34d6e12b35 SHA512 d9b2ead55131ef37a4d2e9d4d3065bb7945bbef7ffc38a336765c0d81cdfba44d6453b92277832ef0c2af4f5b9aff4eb27cfcedf119a74683d1d2a0d2fc8ca0c
diff --git a/net-dialup/tkvoice/files/tkvoice.desktop b/net-dialup/tkvoice/files/tkvoice.desktop
deleted file mode 100644
index 389305340e08..000000000000
--- a/net-dialup/tkvoice/files/tkvoice.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=TkVoice
-Type=Application
-Comment=Phone/Fax Utility
-Exec=tkvoice
-Icon=tkvoice
-Categories=Utility;
diff --git a/net-dialup/tkvoice/metadata.xml b/net-dialup/tkvoice/metadata.xml
deleted file mode 100644
index 821333d9ba87..000000000000
--- a/net-dialup/tkvoice/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Tk-Voice is a Telephone Answering Machine frontend for vgetty
-and also a Facsimile Answering Machine frontend for mgetty.</longdescription>
-</pkgmetadata>
diff --git a/net-dialup/tkvoice/tkvoice-1.5.ebuild b/net-dialup/tkvoice/tkvoice-1.5.ebuild
deleted file mode 100644
index f59b8f107568..000000000000
--- a/net-dialup/tkvoice/tkvoice-1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Voice mail and Fax frontend program"
-HOMEPAGE="http://tkvoice.netfirms.com"
-SRC_URI="http://tkvoice.netfirms.com/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/tk
-	media-libs/netpbm
-	media-sound/sox
-	net-dialup/mgetty"
-DEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "s:/usr/local/etc:/etc:g; s:/usr/local/bin:/usr/bin:g; s:/usr/local/tkvoice:/usr/lib/${P}:g" \
-		"${S}/tkvoice" "${S}/TCL/tkvfaq.tcl" "${S}/TCL/tkvsetupvoice.tcl" || die
-	sed -i -e "s:set STARTDIR .*:set STARTDIR /usr/lib/${P}:" \
-		"${S}/tkvoice" || die
-}
-
-src_install() {
-	exeinto /usr/lib/${P}
-	doexe ${PN}
-	dodir /usr/bin
-	dosym /usr/lib/${P}/${PN} /usr/bin/${PN}
-	insinto /usr/lib/${P}/TCL
-	doins TCL/*
-	insinto /usr/lib/${P}/image
-	doins image/*
-
-	domenu "${FILESDIR}/${PN}.desktop"
-	insinto /usr/share/pixmaps
-	doins ${PN}.xpm
-
-	dodoc BUGS FAQ README TODO
-}
-
-pkg_postinst() {
-	elog "${P} has been installed. Run ${EPREFIX}/usr/bin/${PN}."
-	elog "For more information, see the home page, ${HOMEPAGE}"
-	elog "or consult the documentation for this program as well as"
-	elog "for mgetty/vgetty."
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 7e6ed08e6e41..d2e11c41d0d4 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 39d29b8a2f8e..6208b5c960ab 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,3 +1,4 @@
 DIST pdns-recursor-4.3.3.tar.bz2 1357853 BLAKE2B fa57776bbdb77d1f13f04fdd1fb5ceb07539f851704dc627443a7c814d6640b1e7890333b6d7214a201f5d3f83a54a7840adb6450ffb7696e58722625b7c57c5 SHA512 285f12d3cb2edaca7507dd9dad1356b60076d43af678458346489562ea8933a01d61d2430d5282b6afd213839ee684ad83e5f523c9a272f382d74ccc238bd9d5
 DIST pdns-recursor-4.3.4.tar.bz2 1359380 BLAKE2B b55829b843f3abc9394bcb943c223b24684ebe67854fbde8590aded09a8ef18d8b15d1e2ebe1b88d24833b8782266b1ce853d98c0ce510e115e8d16ce900ece2 SHA512 cfc34f42ed95c7fd2be1ab7ba172672e5e1db96b4ced171c1eae7bd60fb7db482aed928028811b133d326550de35c506a8fc480b12ae39ab7fa142408e0b42d8
+DIST pdns-recursor-4.3.5.tar.bz2 1341930 BLAKE2B 8f81182cb5283e6b8f459c5d23281d20cba02d22cec8776fdab67d452834b82945f467186c98784519d2c79d9df8438b174fc644fb11d68d04f9f636e51a5551 SHA512 2d39e6016000951c0beca38b26c41664b57c059dee762d7499f34e599ed6c2653af73edb31ba5a8d35f749534f24c0d85b6aedf4c35dc8a05777ffebd1b25851
 DIST pdns-recursor-4.4.0-rc2.tar.bz2 1393346 BLAKE2B 00f03dc05747e3b0962fdbff0e2d15b8e9d4703b84bafa086a5e1c229613b42d010ec963296845fe981c9bb99f02f8d60897fe180943091d0b904d0f65f453c0 SHA512 91f63924c30d89bf06dcaf48a588f116cedef530319b4e4682daf14682998b4879aca5d1796aa36a50ba327053523659f9a8ad180d592e5857f898e37f0064ec
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch
new file mode 100644
index 000000000000..40a6ae565847
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-4.3.5-boost-1.73.0.patch
@@ -0,0 +1,47 @@
+From 71246536642590e8e8b21c11307ec4bd0e165066 Mon Sep 17 00:00:00 2001
+From: Remi Gacogne <remi.gacogne@powerdns.com>
+Date: Tue, 28 Apr 2020 17:51:47 +0200
+Subject: [PATCH] Replace boost's placeholders with the ones from the std
+ namespace
+
+Boost 1.73 moved boost::bind placeholders to the placeholders
+namespace which did not exist before 1.60, let's switch to
+std::bind and std::placeholders instead of doing per-version handling.
+---
+ pdns/ixfrdist-web.cc |  2 +-
+ pdns/webserver.cc    |  6 +++---
+ pdns/ws-auth.cc      |  4 ++--
+ pdns/ws-recursor.cc  | 12 ++++++------
+ 4 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/webserver.cc b/webserver.cc
+index eafd3059a0..b47cc6d7e0 100644
+--- a/webserver.cc
++++ b/webserver.cc
+@@ -107,7 +107,7 @@ static void bareHandlerWrapper(WebServer::HandlerFunction handler, YaHTTP::Reque
+ 
+ void WebServer::registerBareHandler(const string& url, HandlerFunction handler)
+ {
+-  YaHTTP::THandlerFunction f = boost::bind(&bareHandlerWrapper, handler, _1, _2);
++  YaHTTP::THandlerFunction f = std::bind(&bareHandlerWrapper, handler, std::placeholders::_1, std::placeholders::_2);
+   YaHTTP::Router::Any(url, f);
+ }
+ 
+@@ -179,7 +179,7 @@ void WebServer::apiWrapper(WebServer::HandlerFunction handler, HttpRequest* req,
+ }
+ 
+ void WebServer::registerApiHandler(const string& url, HandlerFunction handler, bool allowPassword) {
+-  HandlerFunction f = boost::bind(&WebServer::apiWrapper, this, handler, _1, _2, allowPassword);
++  HandlerFunction f = std::bind(&WebServer::apiWrapper, this, handler, std::placeholders::_1, std::placeholders::_2, allowPassword);
+   registerBareHandler(url, f);
+ }
+ 
+@@ -196,7 +196,7 @@ void WebServer::webWrapper(WebServer::HandlerFunction handler, HttpRequest* req,
+ }
+ 
+ void WebServer::registerWebHandler(const string& url, HandlerFunction handler) {
+-  HandlerFunction f = boost::bind(&WebServer::webWrapper, this, handler, _1, _2);
++  HandlerFunction f = std::bind(&WebServer::webWrapper, this, handler, std::placeholders::_1, std::placeholders::_2);
+   registerBareHandler(url, f);
+ }
+ 
diff --git a/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
new file mode 100644
index 000000000000..a02b4e16a140
--- /dev/null
+++ b/net-dns/pdns-recursor/pdns-recursor-4.3.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 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="debug dnstap libressl luajit protobuf snmp sodium systemd"
+REQUIRED_USE="dnstap? ( protobuf )"
+
+DEPEND="!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:= )
+	protobuf? (
+		dev-libs/protobuf
+		>=dev-libs/boost-1.42:=
+	)
+	dnstap? ( dev-libs/fstrm )
+	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
+	acct-user/pdns
+	acct-group/pdns"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/${P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-boost-1.73.0.patch
+)
+
+pkg_setup() {
+	filter-flags -ftree-vectorize
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/powerdns \
+		--with-lua=$(usex luajit luajit lua) \
+		$(use_enable debug verbose-logging) \
+		$(use_enable systemd) \
+		$(use_enable dnstap dnstap) \
+		$(use_with sodium libsodium) \
+		$(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=pdns/' \
+		-e 's/^# quiet=$/quiet=on/' \
+		-e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \
+		"${D}"/etc/powerdns/recursor.conf
+
+	newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor
+}
+
+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-irc/Manifest.gz b/net-irc/Manifest.gz
index 23190545dbe1..3cf743c26c48 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
index bf8f2d320881..37383594fb1e 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6af2501eb63f..0e716a35b087 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index 2a72935ad999..5adb87ca3682 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,4 +1,4 @@
-DIST croc-8.4.0.tar.gz 2545504 BLAKE2B d0161662ad4d7af9075a2ca1f35731c925c4d42c42cae96eb73e6b83cca77f87856d313d468201d5700547071b3ae5e9b0eff28b59426d6d55b904a5c0c04b83 SHA512 71caefce877e600e75e6e4253c61622d6e2c5f369490da41f2a95ebfd194299af98c2f893c206381ad7b091c08eab1b02527f4c47c28362fc7257f0fc09823cc
+DIST croc-8.5.1.tar.gz 2554874 BLAKE2B 0eb40f9c3e32dfb2a4f8d2de7a0769677df3482b1a269f3118056dbd2190b409feffbe78242a7b9a2397b6249601a59452d62b75b8766d3c9b5e1693a02ff2dc SHA512 56e57161b41941ef8b71a0f4a48213760155357200ad59335a87ca4febc5e70e5cdc7bf8e31f79d3c26c2fffb105085300d5374c9126928eb22195be335be565
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765
@@ -24,8 +24,8 @@ DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7cce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip 13682 BLAKE2B d7065d3799d84593a9f7f7d93b8c286b7673505bb292208ba0475573667831ecf1aca5236f4703f1bd4d43e41b7cb688a9abe7502181edc9a76305e2a5842ebf SHA512 60a5dfa6c733fa6f71f2b0fb16ee153b2905f940b5eb7e95ff0d04bd3537961467426a1f6064d079fb164190d6a8b3c4bdeece2bf643057f34f7f96e9842f54f
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
@@ -50,8 +50,8 @@ DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.0.mod 259 BLAKE2B 5e53a986
 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.0.zip 10286 BLAKE2B 36f83614f5f443bca84956bd58e6d813c97d2627fb4330aa50faa9453f9cab0eaef87dffddf229f04706486d57933ab90fa97ce9a3a9209d2d39c96c23e01cc7 SHA512 08cbb78e55392078b41d287823994a48a8af64649371acbc1e86f9a42c318dca18ce42c54eca65779477f4a454469d7601483b07cce7db3a2c7b40b5b1939a22
 DIST github.com%2Fschollz%2Fprogressbar%2Fv2%2F@v%2Fv2.15.0.mod 215 BLAKE2B ffd46ea78d3bd4056b847fbc7fe0dc3a0d66311c962e116209c6d36a55310324cd4911a57faa695f8b9fdfa18e44f1feca756746760770c3928f42df428ce97e SHA512 ecff876ae068c2b14b675ef336b2b217b490302d3db183cecc6ab70f981d4b848c4b85acfe9637159bc18002b606904bf318387e9722b995901cca1f3bf836cd
 DIST github.com%2Fschollz%2Fprogressbar%2Fv2%2F@v%2Fv2.15.0.zip 11585 BLAKE2B e601ef9ca149678f6f56e35d3e6248134269968796fe61fc04edfef81199c199c3e28ef1b3981fe388bda92296b91ffaafbd7ea89234b6d541bdeb13de270ce4 SHA512 c9c52f87ba0472d909ce10d9e31bb978334bea9264999591e0c14a86dc39edd05704d8c0174f498617b760d8087d5e9ee585f999aa80d4c039a8720633a7a567
-DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.5.1.mod 429 BLAKE2B 3aea302dca6784c0ec50a040419fdc2537af06f18b469a70777896c34dedd5d21a1a5588f024ee3ea0f9bf77e1cc794405b45b6d705600a7ad0cbb6080679c06 SHA512 58caaaa80b8c2cf73287afb985959b0f31a113fd38fc8d9c635b4fd3a308bab5e6694e49388790d54ecbb3e27e525b62e863a8430b189ff6d4c896d6ed3ed34a
-DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.5.1.zip 605787 BLAKE2B 339fca9864d95f7776dba2eb97a44a3cf55d7155be37bcbc491563ff2e6f8390de842cd3cdb2e8ac2cf5e9add200774b8260778e51f6af944c02533b7600b39c SHA512 7aed0a84d74289245090da6566dd0bb9a0d8858792e31e9fece26344ae8670039a0ec6c4cb6533f7759d098ffceafdf7019adaa853f07e0689ae15b0602ea7ff
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.6.0.mod 429 BLAKE2B 3aea302dca6784c0ec50a040419fdc2537af06f18b469a70777896c34dedd5d21a1a5588f024ee3ea0f9bf77e1cc794405b45b6d705600a7ad0cbb6080679c06 SHA512 58caaaa80b8c2cf73287afb985959b0f31a113fd38fc8d9c635b4fd3a308bab5e6694e49388790d54ecbb3e27e525b62e863a8430b189ff6d4c896d6ed3ed34a
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.6.0.zip 606147 BLAKE2B 7a0a0ee041abf9801dbb0276abcb34a073c4a577660dd43d27d0b97546cd6c0c8967b36f4279a65e160126e08a5eb426110d55dea3b5b72cee720ea56969157f SHA512 b43d72b5ab7480ee6103b9e6ceb756ff18388b59f5b9a1688e05d7fbc5289520a327435798e763a6d7b05978933a984dba1f9de7a25f3036022f810e9d209846
 DIST github.com%2Fschollz%2Fspinner%2F@v%2Fv0.0.0-20180925172146-6bbc5f7804f9.mod 34 BLAKE2B 5f3c9e06283ff0f5bebdd8f2dd80b5c73889cd9c8b4151e1eba6a7d8a32bd5a3d97a8fb4523cddf08f9ed6155b1082fc290524a6bfca218b650dd327a13dba41 SHA512 aeae9f51dff80a8751c736027566b69fdf60131438135e3d33fbba1008c384a4bfdc7ae646357399f04d358c2cd305da3d693f2dfc7d1b67ed2d81e03a67062d
 DIST github.com%2Fschollz%2Fspinner%2F@v%2Fv0.0.0-20180925172146-6bbc5f7804f9.zip 15758 BLAKE2B 09b3b2c9128c1c879299a9224306a940ced1e9d8493d45af7260d95cddf19714f675e620667e90f67da60d1b9170c3df1667f6d10be5675396ad2a3ec06c211a SHA512 0d6489d0f8be43d9a0e5f543d6d4b0c190d34309dcd0dacd4ed0d795015f671a8964608d9235b70b89826af90207226214ceef5f41860ab7d3d6d1fdb7f486b1
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
@@ -70,13 +70,13 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod 155 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.zip 1874278 BLAKE2B c9d8d7150f589d4b313bff96b41e1a24616db4e9a6447f1a20b81e15c35d6dd966507f5b24564afb904e81768f6c226ee73d3bf4ac3ce736c0276eaabc38a139 SHA512 61a5eb5e3af434483bfdd470a028b10c7ea6bf149e0cb4d4443cb8325417cf5b4e85d2fb2e6335dba74d366b80d4bf0b6d6450dbcb3f3e06714c2bc4b0ef6f75
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip 1876176 BLAKE2B 84ea067e58783d36780037272d669162fce90fac23d5bb6090898e14ed6753ebd4bafc001b3e3ec792a29a2a802d57763a365a3f89f1acfc37f18e320aee42e6 SHA512 1a94d4b9e787a0f322cf9ee223c3b01d8dbd34b59381330808d2682ae05de0cdad62c31e085c554033e852bc5fe49d789993a668a2d75bd7eb8b2389ac774e65
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201012173705-84dcc777aaee.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201012173705-84dcc777aaee.zip 1878084 BLAKE2B d81db5f013f0f91cc46cccf127c8610b55b9132620a1063cff929cd3b60fa4d4aa2a57d536e0277cb7d9d4f1bf5f7a90f627c4282dee09013cd00c2141713d76 SHA512 c3bd67d79998b423b247f57d77542a728dbca956f740cc55c44f925be4f740b1c8e29deb6de5ce1a9eb8076dd3bb9524eed10a441cf449b9bfb3f54fbbb5412d
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip 1505530 BLAKE2B b26f3f943953ecb17996f44c0e8278b56c7d01648227cc0b73cbb17e9fc44b40bbbac34ac4996fb88115a6451178d3c94f4c17a43cedd30f9c147312fd7e04ce SHA512 7b36db6f767f03d0a14ee599c6d1bcc7cf5cb8df69b9dd46d7544aac59ff6aa1bdf38af0f3f31328f02b7643f7655b375f8116f829b22993ae49951ab28cbef9
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201010224723-4f7140c49acb.zip 1503276 BLAKE2B ee7a6071af9cfd60c928119c9a66770467c9610c027e1adf347460ff97a8a84256de915898d8b2aa6a844cd47660f1050ce25cce0aa6669d32eb51d50ea09904 SHA512 f4ddd2c8c10bc79f3c4f0d246ae5a88e36ba5e1d457dc16ac8e4315958432c3cf3debedfc222d4591cca2c72dad2eb5771be3e8c4fef1087f330f077c80b14a5
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -89,8 +89,9 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip 1479123 BLAKE2B 45f0af63ffb886cbd78269a103067057346ab756631f228fc27b68459bdde97c84c100f99045e1a4a8d336513c4192b377048db8e09cefa703e94ca814d6eb07 SHA512 57783ce5463ce2a6a2d76d8ed3df08a23de896ca82e7456597a0fa55fe80bec64f899085fc727f0bf369495d1bca70a10e0f7071e7e66f6a5ecba1b4f42ffe54
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916084744-dbad9cb7cb7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916084744-dbad9cb7cb7a.zip 1487101 BLAKE2B 248836520e1dae45333b38bbdc889cf8ce136c536891ce3e819af8decba00317dda0b4e186607b25e2ad605997c1c8ee1f7535077e6f9f2e79fdb89c8fcc125b SHA512 410356c04131880f99da82743350d70fbbdcb71b85f1a96be3648eaf580942770ed2146594928e13cef46ccc9a2bfc9b125f3de2568aabea1c9610684ea16659
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201013132646-2da7054afaeb.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201013132646-2da7054afaeb.zip 1492785 BLAKE2B 71b7835006c5015e8a79e0520b521fe663da3468c59864687ba44f269dfd6bdec628a7e1089b151bc20f2872dac1bca51f4c1ef99c198cbd647b2294674a1070 SHA512 848eae49b16db3ffdc9112c3daef89688a324f25d6cdac6a45c28dc3024bc0fbb0c0f4c845e7505c7e4e93a524e045d895a6d2b662bce88d76ac745755c10feb
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
diff --git a/net-misc/croc/croc-8.4.0.ebuild b/net-misc/croc/croc-8.5.1.ebuild
similarity index 88%
rename from net-misc/croc/croc-8.4.0.ebuild
rename to net-misc/croc/croc-8.5.1.ebuild
index 0ba9d2efec4a..2562bcb63af3 100644
--- a/net-misc/croc/croc-8.4.0.ebuild
+++ b/net-misc/croc/croc-8.5.1.ebuild
@@ -34,8 +34,8 @@ EGO_SUM=(
 	"github.com/kr/text v0.1.0"
 	"github.com/kr/text v0.1.0/go.mod"
 	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-colorable v0.1.7"
-	"github.com/mattn/go-colorable v0.1.7/go.mod"
+	"github.com/mattn/go-colorable v0.1.8"
+	"github.com/mattn/go-colorable v0.1.8/go.mod"
 	"github.com/mattn/go-isatty v0.0.8/go.mod"
 	"github.com/mattn/go-isatty v0.0.11/go.mod"
 	"github.com/mattn/go-isatty v0.0.12"
@@ -60,8 +60,8 @@ EGO_SUM=(
 	"github.com/schollz/peerdiscovery v1.6.0/go.mod"
 	"github.com/schollz/progressbar/v2 v2.15.0"
 	"github.com/schollz/progressbar/v2 v2.15.0/go.mod"
-	"github.com/schollz/progressbar/v3 v3.5.1"
-	"github.com/schollz/progressbar/v3 v3.5.1/go.mod"
+	"github.com/schollz/progressbar/v3 v3.6.0"
+	"github.com/schollz/progressbar/v3 v3.6.0/go.mod"
 	"github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9"
 	"github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9/go.mod"
 	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
@@ -80,13 +80,13 @@ EGO_SUM=(
 	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
 	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
 	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
-	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee"
+	"golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod"
 	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
 	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
 	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/net v0.0.0-20200904194848-62affa334b73"
-	"golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod"
+	"golang.org/x/net v0.0.0-20201010224723-4f7140c49acb"
+	"golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
 	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
@@ -99,8 +99,9 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
 	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae"
 	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200916084744-dbad9cb7cb7a"
-	"golang.org/x/sys v0.0.0-20200916084744-dbad9cb7cb7a/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201013132646-2da7054afaeb"
+	"golang.org/x/sys v0.0.0-20201013132646-2da7054afaeb/go.mod"
 	"golang.org/x/text v0.3.0/go.mod"
 	"golang.org/x/text v0.3.3"
 	"golang.org/x/text v0.3.3/go.mod"
@@ -128,6 +129,10 @@ RDEPEND="
 	acct-user/croc
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-disable-network-tests.patch"
+)
+
 DOCS=( README.md )
 
 src_prepare() {
@@ -138,7 +143,7 @@ src_prepare() {
 	sed -i -e "s|_cli_bash_autocomplete|_croc|g" \
 		src/install/bash_autocomplete || die
 	# Set correct version
-	sed -i -e "s|v8.3.2-7d155ad|v${PV}|g" \
+	sed -i -e "s|v8.5.0-586fc08|v${PV}|g" \
 		src/cli/cli.go || die
 }
 
@@ -152,3 +157,7 @@ src_install() {
 	newbashcomp src/install/bash_autocomplete croc
 	einstalldocs
 }
+
+src_test() {
+	go test -work ./... || die
+}
diff --git a/net-misc/croc/files/croc-disable-network-tests.patch b/net-misc/croc/files/croc-disable-network-tests.patch
new file mode 100644
index 000000000000..92a3a620b96e
--- /dev/null
+++ b/net-misc/croc/files/croc-disable-network-tests.patch
@@ -0,0 +1,33 @@
+Disable tests that fail with network-sandbox
+
+index 101162e..5be096e 100644
+--- a/src/utils/utils_test.go
++++ b/src/utils/utils_test.go
+@@ -7,7 +7,6 @@ import (
+ 	"log"
+ 	"math/rand"
+ 	"os"
+-	"strings"
+ 	"testing"
+ 
+ 	"github.com/stretchr/testify/assert"
+@@ -169,19 +168,6 @@ func TestHashFile(t *testing.T) {
+ 	assert.Equal(t, "18c9673a4bb8325d323e7f24fda9ae1e", fmt.Sprintf("%x", hashed))
+ }
+ 
+-func TestPublicIP(t *testing.T) {
+-	ip, err := PublicIP()
+-	fmt.Println(ip)
+-	assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
+-	assert.Nil(t, err)
+-}
+-
+-func TestLocalIP(t *testing.T) {
+-	ip := LocalIP()
+-	fmt.Println(ip)
+-	assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
+-}
+-
+ func TestGetRandomName(t *testing.T) {
+ 	name := GetRandomName()
+ 	assert.NotEmpty(t, name)
diff --git a/net-misc/curl/curl-7.72.0.ebuild b/net-misc/curl/curl-7.72.0.ebuild
index 9c23ebe8f00f..c2870a90b659 100644
--- a/net-misc/curl/curl-7.72.0.ebuild
+++ b/net-misc/curl/curl-7.72.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 LICENSE="curl"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli +ftp gnutls gopher +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/electrum/electrum-4.0.2.ebuild b/net-misc/electrum/electrum-4.0.2.ebuild
index 5f1d63884893..e0a18742e6b5 100644
--- a/net-misc/electrum/electrum-4.0.2.ebuild
+++ b/net-misc/electrum/electrum-4.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
diff --git a/net-misc/httpie/httpie-2.2.0.ebuild b/net-misc/httpie/httpie-2.2.0.ebuild
index e3773e796fbe..bab02d0b537a 100644
--- a/net-misc/httpie/httpie-2.2.0.ebuild
+++ b/net-misc/httpie/httpie-2.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 96639de474be..b78cbf43f0d7 100644
Binary files a/net-news/Manifest.gz and b/net-news/Manifest.gz differ
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index f598be8c1fdf..82e93830fa5a 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -1,2 +1 @@
-DIST quiterss-0.19.3.tar.gz 3765681 BLAKE2B 81d5fc78fc75328040a862306b4a3c76ff76f99953072e14e143d8283126c43410a5bb2b9c98a2c2c95959c1883b2a50d2e647cbb2cee2614f6ae3d15e25ac90 SHA512 8f8a7a25e53bb08a2b4f8f462aa2b74127eaeae7babc0ef448eff1d448de05bac6f59942a578d16cf24a5e554a004a5a2bfc7508b875c7eb54e3c4ebaa3ac51e
 DIST quiterss-0.19.4.tar.gz 3771775 BLAKE2B d1515a13b4b26a9bfae1760d25e1ab28b1ca797806dc49f2826631764755ad61f5ed887a1c17f6728f45b0fd33271f06157acb1a529a628e0a0f5acb436bee23 SHA512 117a83f7ef61907b8625b0da1fbe069974fa06a434040e54c9c90d8ca572dc60aa96c1081dbe3d7110d0c9304fe47dafe1faeedcc45e32bbf638b793eede96da
diff --git a/net-news/quiterss/quiterss-0.19.3.ebuild b/net-news/quiterss/quiterss-0.19.3.ebuild
deleted file mode 100644
index 4b160b25c63a..000000000000
--- a/net-news/quiterss/quiterss-0.19.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="A Qt-based RSS/Atom feed reader"
-HOMEPAGE="https://quiterss.org"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-db/sqlite-3.11.1:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e "s/exists(.git)/0/" -i QuiteRSS.pro || die
-}
-
-src_configure() {
-	local myqmakeargs=(
-		PREFIX="${EPREFIX}/usr"
-		SYSTEMQTSA=1
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/net-news/quiterss/quiterss-0.19.4.ebuild b/net-news/quiterss/quiterss-0.19.4.ebuild
index 2563e58e165a..d77a928c2f35 100644
--- a/net-news/quiterss/quiterss-0.19.4.ebuild
+++ b/net-news/quiterss/quiterss-0.19.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 789e107d30e1..3619b1061736 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.6-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
index e71b20d39d6f..815680f34379 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="~amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 350f6579314e..d8b969ec27fb 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -3,3 +3,4 @@ DIST unifi-6.0.23.zip 183386177 BLAKE2B ee0300c9595bab469e63c8c523f75507e5b4ef88
 DIST unifi-6.0.26.zip 226932393 BLAKE2B f5c42eccbcfea45af30cf10da69dccbb9b8ddccef53c7c35db059e53ddf5800fecdde84be88dd80320c265c655dc71d18cf25851090e29209204d39552200466 SHA512 3f221035dd27c38cd59b3a1202ce526143eb9bc6253e1e157a82e0cbb765445c8264c09177593830493598a8ef65cce2406bf25b84c242674b35c66db341743e
 DIST unifi-6.0.27.zip 214476444 BLAKE2B e13f5255d46c07fa9973cde14ad62bffa955a8a3ad84b3652d3cc4979d2280965166009fac6f8dacb68e94886d1e5680bd6e3bd3cf5caf611738d90e738a023f SHA512 b511011f424281dc9fd50ddca708daeb22f76743cb02df3cbb32be238bc477828f9720b798ac79067c1e315c17db9d73f7fe47930053637d39d61d3583e90901
 DIST unifi-6.1.16.zip 220033149 BLAKE2B 4e965c1577ef35d3dd28357aa884f8234f3cc9c45783dd261153ecc87bda24fc4b58ea4f49096304331bd11896251c29eaaa8e8b44046e50ee7e9d54d997223a SHA512 d1b241d5a47ee34c66a08b847405f615f83782fc67a38fe5fc4c281bac6335bc2ab8b021774cafb98753759b9924e773a2c4883a1ed2b30cb2e58ab56b3c07f3
+DIST unifi-6.1.19.zip 222132389 BLAKE2B 6a27fbb8a3a1b2e83fb70932b8409f9cab0632de1442436ff351d01e82228a4bbf0b71de3bef074777db93d0d3bcf58789a6b56e4eb23f1464523294fcd13d7f SHA512 f07d5a10132d5549c332ab9c0a86a4d3edf9178d441c795fd0da87bd00f82598a78a6cb5cedc285f2d20465a52689c7cf7ea3378cf0e84e834c8fa8613868e55
diff --git a/net-wireless/unifi/unifi-6.1.19.ebuild b/net-wireless/unifi/unifi-6.1.19.ebuild
new file mode 100644
index 000000000000..daa786331289
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.1.19.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Set this var for any releases except stable
+RC_SUFFIX="-c13306eeee"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.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/6.1"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	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"
+
+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() {
+	insinto /usr/lib/unifi
+	doins -r bin 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 d00d67c0ec4a..3a9ef9a55fb9 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index d94ce1f6df0f..b17d5164a11f 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mark Wright <gienah@gentoo.org> (2020-10-11)
+# dev-ml/ppx_jane is not keyworded
+dev-ml/cinaps test
+dev-ml/ppx_expect test
+
 # Joonas Niilola <juippis@gentoo.org> (2020-10-02)
 # Dependency only keyworded on specific arm profiles.
 dev-libs/efl avif
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 1f93b71eb522..e307b4bf62c5 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mark Wright <gienah@gentoo.org> (2020-10-11)
+# dev-ml/ppx_jane is not keyworded
+dev-ml/cinaps test
+dev-ml/ppx_expect test
+
 # Sam James <sam@gentoo.org> (2020-10-06)
 # Deprecated. See bug #741855.
 net-mail/dovecot vpopmail
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 65fe9d1f6463..11c1667485c7 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mark Wright <gienah@gentoo.org> (2020-10-11)
+# dev-ml/ounit2 is not keyworded
+dev-ml/cudf test
+
 # Mart Raudsepp <leio@gentoo.org> (2020-08-02)
 # ppc32 has no virtual/rust support yet, needed by newer
 # gnome-base/librsvg, et al
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index c4f408fa444a..76555b2d6c17 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mark Wright <gienah@gentoo.org> (2020-10-11)
+# dev-ml/ppx_jane is not keyworded
+dev-ml/cinaps test
+dev-ml/ppx_expect test
+
 # Thomas Deutschmann <whissi@gentoo.org> (2020-10-07)
 # <app-admin/salt-3000 is Python 3.6 but last Python 3.6
 # compatible dev-python/libvirt-python version was removed
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index e22135e4f5ed..e1496a7e85b7 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Alexis Ballier <aballier@gentoo.org> (2020-10-13)
+# Nothing depends on those ROS messages. dev-ros/geneus
+# is half broken in our setup where it looks for packages
+# on the filesystem and causes build failures.
+# See e.g. https://bugs.gentoo.org/741076
+ros_messages_eus
+
 # Michał Górny <mgorny@gentoo.org> (2020-08-22)
 # app-office/openoffice-bin is being removed.
 office_implementation_openoffice
diff --git a/profiles/package.mask b/profiles/package.mask
index f9c24daf8352..b3430e1278a3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,20 @@
 
 #--- END OF EXAMPLES ---
 
+# Marek Szuba <marecki@gentoo.org> (2020-10-13)
+# Not compatible with >=dev-libs/openssl-1.1.0, no maintainer in Gentoo,
+# no new commits to the upstream Git repository since September 2013.
+# No reverse dependencies. Removal in 30 days (Bug #736190).
+dev-lua/luacrypto
+
+# Marek Szuba <marecki@gentoo.org> (2020-10-13)
+# All these ebuilds require slotted Lua, which is still masked.
+>=app-misc/worker-3.8.3-r100
+>=dev-lua/luv-1.32.0.0-r100
+>=dev-lua/messagepack-0.3.2-r100
+>=dev-lua/toluapp-1.0.93_p20190513-r100
+>=games-engines/love-11.3-r100:0
+
 # Andrew Savchenko <bircoph@gentoo.org> (2020-10-11)
 # Mask old openafs version and corresponding openafs-kernel with
 # multiple CVEs.
@@ -430,22 +444,6 @@ sys-fs/ufsutils
 # #742158.
 net-nntp/sn
 
-# Jonas Stein <jstein@gentoo.org> (2020-09-13)
-# mpv bash completion is no longer needed and the package is not
-# compatible with the remaining packages.
-# Masked for removal after 2020-11-01.
-# Bug #742395
-app-shells/mpv-bash-completion
-
-# Louis Sautier <sbraz@gentoo.org> (2020-09-13)
-# Masked for removal in 30 days, unmaintained, no more revdeps.
-dev-python/args
-
-# Sam James <sam@gentoo.org> (2020-09-13)
-# Dead upstream, EAPI 4, no maintainer
-# Removal in 30 days
-net-dialup/tkvoice
-
 # Thomas Deutschmann <whissi@gentoo.org> (2020-09-11)
 # These versions are not compatible with current stable
 # dev-libs/openssl version, bug #741622.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 8453d8776cc9..e86693085cd7 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3643,11 +3643,16 @@ kde-plasma/kdeplasma-addons:comic - Enable comic applet (requires deprecated kde
 kde-plasma/kdeplasma-addons:share - Enable applet for quickly sharing data to a variety of sources
 kde-plasma/kdeplasma-addons:webengine - Enable dictionary and web browser applets using dev-qt/qtwebengine
 kde-plasma/kinfocenter:pci - Show advanced PCI information
+kde-plasma/ksysguard:network - Enable per-process network statistic collection using dev-libs/libnl
+kde-plasma/ksysguard:networkmanager - Enable improved backend for Network statistics using kde-frameworks/networkmanager-qt
 kde-plasma/ksysguard:pcap - Enable per-process network statistic collection using net-libs/libpcap
 kde-plasma/kwin:multimedia - Enable effect video button in desktop effects KCM
+kde-plasma/kwin:screencast - Enable screencast portal using media-video/pipewire
+kde-plasma/libksysguard:designer - Build plugins for dev-qt/designer
 kde-plasma/libksysguard:webengine - Enable display of detailed memory information using dev-qt/qtwebengine.
 kde-plasma/plasma-desktop:emoji - Build emojipicker applet using app-i18n/ibus and media-fonts/noto-emoji
 kde-plasma/plasma-desktop:ibus - Use ibus input method via app-i18n/ibus
+kde-plasma/plasma-desktop:kaccounts - Build the OpenDesktop integration plugin
 kde-plasma/plasma-desktop:scim - Enable applets that use app-i18n/scim
 kde-plasma/plasma-meta:browser-integration - Enable integration with Chrome/Firefox with browser extensions
 kde-plasma/plasma-meta:crypt - Pull in kde-plasma/plasma-vault for encrypted vaults integration
@@ -3673,6 +3678,7 @@ kde-plasma/plasma-workspace:appstream - Enable AppStream software metadata suppo
 kde-plasma/plasma-workspace:geolocation - Enables dataengine providing location information
 kde-plasma/plasma-workspace:qalculate - Enable Qalculate runner using sci-libs/libqalculate
 kde-plasma/plasma-workspace:qrcode - Enable support for creating QR codes from clipboard data using kde-frameworks/prison
+kde-plasma/plasma-workspace:screencast - Enable screencast portal using media-video/pipewire
 kde-plasma/plasma-workspace:telemetry - Enable User Feedback control module for kde-plasma/systemsettings
 kde-plasma/powerdevil:brightness-control - Enable screen brightness control using app-misc/ddcutil
 kde-plasma/powerdevil:wireless - Enable wireless energy saving actions via kde-frameworks/bluez-qt and kde-frameworks/networkmanager-qt
@@ -4141,7 +4147,6 @@ media-libs/cogl:pango - Build cogl-pango library for x11-libs/pango integration
 media-libs/coin:exceptions - Compile with C++ exceptions
 media-libs/coin:man - Build and install man pages
 media-libs/coin:qthelp - Build API documentation in QtHelp format
-media-libs/coin:simage - Texture loading via media-libs/simage library
 media-libs/dav1d:10bit - Add support for building 10-bit and 12-bit AV1.
 media-libs/dav1d:8bit - Add support for decoding 8-bit AV1.
 media-libs/dav1d:asm - Enable custom assembly for faster decoding.
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index b2ebacbddaea..fd59627d0f0b 100644
Binary files a/ros-meta/Manifest.gz and b/ros-meta/Manifest.gz differ
diff --git a/ros-meta/mavros/mavros-1.4.0.ebuild b/ros-meta/mavros/mavros-1.4.0.ebuild
new file mode 100644
index 000000000000..1696b416fda8
--- /dev/null
+++ b/ros-meta/mavros/mavros-1.4.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Metapackage for mavros packages"
+LICENSE="metapackage"
+SLOT="0"
+IUSE=""
+HOMEPAGE="https://wiki.ros.org/mavros"
+
+RDEPEND="
+	dev-ros/mavros_msgs
+	dev-ros/libmavconn
+	dev-ros/mavros
+	dev-ros/mavros_extras
+"
+DEPEND="${RDEPEND}"
+[ "${PV}" = "9999" ] || KEYWORDS="~amd64 ~arm"
diff --git a/ros-meta/rosserial/Manifest b/ros-meta/rosserial/Manifest
index 7642ef7cb1e1..b7fd4069d988 100644
--- a/ros-meta/rosserial/Manifest
+++ b/ros-meta/rosserial/Manifest
@@ -1 +1,2 @@
 DIST rosserial-0.8.0.tar.gz 312494 BLAKE2B f65d42ebdc47125a7dfb9b3a999f53640812bc9741f43a5b451fbe449d6d23537face7ca148b2b952c401bb439cee05693f5663e423e70d9df3bbde0d07fbb0a SHA512 ee2f4b3b39fd3be47cbaaed7bfbe08057b1525a12f31dd685d80683ec1ddc89ff43157cc0f09583e68ccc6e35009fda73efa8a74dad6c5bba4b46f4ad6a155d0
+DIST rosserial-0.9.1.tar.gz 318452 BLAKE2B 3901c9fb8813cc93b31a4286272508fb2e8026a540becc1f58d674195cc90354ba43aa7307891d8d2fc9b7ef594fa5597d49f2209f4862dc5467f57e49e0c5b4 SHA512 a484983e1e4c3f86b311b07bc402d5984f9161dc025bb7017fd936e3551368b6af00484724ebaed16777a45b40ab2323ea25309fe7f313ee52a7245b035ccf17
diff --git a/ros-meta/rosserial/rosserial-0.9.1.ebuild b/ros-meta/rosserial/rosserial-0.9.1.ebuild
new file mode 100644
index 000000000000..6d037433fddb
--- /dev/null
+++ b/ros-meta/rosserial/rosserial-0.9.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage for core of rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosserial_arduino
+	dev-ros/rosserial_client
+	dev-ros/rosserial_embeddedlinux
+	dev-ros/rosserial_msgs
+	dev-ros/rosserial_python
+	dev-ros/rosserial_server
+	dev-ros/rosserial_tivac
+	dev-ros/rosserial_windows
+	dev-ros/rosserial_xbee
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index e2021ea064bc..6a0db94b02d5 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/bc-gh/Manifest b/sci-calculators/bc-gh/Manifest
index 6149c2c0616d..b707fba0ff2f 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,3 +1,2 @@
-DIST bc-2.7.2.tar.xz 189020 BLAKE2B 6b4d78deeb6a4724e4a336f51d9489610b9f1069c723a398c30885ebfdf0ba849172bc4b2b5561592b5b004cc5e450da3845bed51751e2d487bcf613ea3606bc SHA512 c2014b16165bf5f8bdadf42bb60ea967a060753c17e13a7c3569d16d218bb3fb644e6a46950e9e7b3aa5a9f6bee4da9b158694909a0ab1fe390b7bb4dc20b303
-DIST bc-3.1.3.tar.xz 210924 BLAKE2B 9a442ad7808231bd5741a70f876dc918ac2747d07ab676f13594e14370f660b9a83a0733c7bcf818d14c2134dfa6da3a87f49b28aff1a1f803525567b3625560 SHA512 fb702e45fb994d4f1be55c2b05c4c4b4c67ae838f4f46864ba944890c1810b871fbafaa323d432f0f600f8182b4370757b75de756ae2795b595776e3fe03ba7b
 DIST bc-3.1.5.tar.xz 211632 BLAKE2B f5a38bd87d3c8d674d79141ee00a071e474e7c1ccb2e1fc9944b4496ae8a4613d57cc0b6dfbad5ea35bd59300c23f307364b96cdbffef4b07b10863df413cecd SHA512 34be1c186df5906ab7a966739220a20afd7e3b227a5c7ba32a77256a36e097bbcc39b99ce6d6855de3e6e2296612f8fbe63dc0983ad91d4eb4c1e630dbb587a0
+DIST bc-3.1.6.tar.xz 210976 BLAKE2B 3d3c3102cb97b83e09e3ed61b4bf5862791b4ea8131b5c8dfa6a55bbb42d423b627cd9c5ac8ba6ed6fc7f58f1e92e662541fbd1ea2fdf834292271a16c193564 SHA512 1219a074845b8c66a431ddb78bab643793f5275c26404e92e360e655418d70d1aafa02be2fc4dec25d99a85ae2da1aab7d615de893f85913ca8834448dcade53
diff --git a/sci-calculators/bc-gh/bc-gh-2.7.2.ebuild b/sci-calculators/bc-gh/bc-gh-2.7.2.ebuild
deleted file mode 100644
index 66e56800fe67..000000000000
--- a/sci-calculators/bc-gh/bc-gh-2.7.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implementation of POSIX bc with GNU extensions"
-HOMEPAGE="https://github.com/gavinhoward/bc"
-SRC_URI="https://github.com/gavinhoward/bc/releases/download/${PV}/bc-${PV}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/bc-${PV}"
-
-src_configure() {
-	EXECSUFFIX="-gh" PREFIX="${EPREFIX}/usr" ./configure.sh -GT || die
-}
diff --git a/sci-calculators/bc-gh/bc-gh-3.1.3.ebuild b/sci-calculators/bc-gh/bc-gh-3.1.6.ebuild
similarity index 100%
rename from sci-calculators/bc-gh/bc-gh-3.1.3.ebuild
rename to sci-calculators/bc-gh/bc-gh-3.1.6.ebuild
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 9aec67e407d0..793da7e09107 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/gromacs/gromacs-2020.1-r1.ebuild b/sci-chemistry/gromacs/gromacs-2020.1-r1.ebuild
index ba456196edd8..93c02c87848c 100644
--- a/sci-chemistry/gromacs/gromacs-2020.1-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/sci-chemistry/gromacs/gromacs-2020.2.ebuild b/sci-chemistry/gromacs/gromacs-2020.2.ebuild
index ba456196edd8..93c02c87848c 100644
--- a/sci-chemistry/gromacs/gromacs-2020.2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/sci-chemistry/gromacs/gromacs-2020.3.ebuild b/sci-chemistry/gromacs/gromacs-2020.3.ebuild
index ba456196edd8..93c02c87848c 100644
--- a/sci-chemistry/gromacs/gromacs-2020.3.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/sci-chemistry/gromacs/gromacs-2020.4.ebuild b/sci-chemistry/gromacs/gromacs-2020.4.ebuild
index ba456196edd8..93c02c87848c 100644
--- a/sci-chemistry/gromacs/gromacs-2020.4.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/sci-chemistry/gromacs/gromacs-2020.9999.ebuild b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild
index 92600477ee91..93c02c87848c 100644
--- a/sci-chemistry/gromacs/gromacs-2020.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild
@@ -5,11 +5,11 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_SINGLE_IMPL=1
 
-inherit bash-completion-r1 cmake cuda distutils-r1 eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+inherit bash-completion-r1 cmake cuda distutils-r1 eutils flag-o-matic multilib readme.gentoo-r1 toolchain-funcs xdg-utils
 
 if [[ $PV = *9999* ]]; then
 	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
@@ -34,7 +34,7 @@ HOMEPAGE="http://www.gromacs.org/"
 #        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
 LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
 SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
+IUSE="X blas cuda +custom-cflags +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
 
 CDEPEND="
 	X? (
@@ -159,13 +159,17 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs_pre=( ) extra fft_opts=( )
 
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
+	if use custom-cflags; then
+		#go from slowest to fastest acceleration
+		local acce="None"
+		use cpu_flags_x86_sse2 && acce="SSE2"
+		use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+		use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+		use cpu_flags_x86_avx && acce="AVX_256"
+		use cpu_flags_x86_avx2 && acce="AVX2_256"
+	else
+		strip-flags
+	fi
 
 	#to create man pages, build tree binaries are executed (bug #398437)
 	[[ ${CHOST} = *-darwin* ]] && \
@@ -320,7 +324,7 @@ src_install() {
 	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
 		local n=${x##*/gmx-completion-}
 		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion-gmx.bash "$x" > "${T}/${n}" || die
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
 		newbashcomp "${T}"/"${n}" "${n}"
 	done
 	rm "${ED}"/usr/bin/gmx-completion*.bash || die
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index 203a0f716f57..808f5df33db2 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild b/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild
index fba1fb10eed2..b2c7bf93d80d 100644
--- a/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild
+++ b/sci-chemistry/mdtraj/mdtraj-1.9.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
index e469b6431e82..0a2e041f0dad 100644
--- a/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
+++ b/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 desktop optfeature flag-o-matic xdg-utils
 
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 9b37dbf87722..8cfcf4047c26 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/kicad/kicad-5.1.6.ebuild b/sci-electronics/kicad/kicad-5.1.6.ebuild
index bd19cc4e2bd7..0eff75e7cb86 100644
--- a/sci-electronics/kicad/kicad-5.1.6.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 WX_GTK_VER="3.0-gtk3"
 
diff --git a/sci-electronics/kicad/kicad-5.1.7.ebuild b/sci-electronics/kicad/kicad-5.1.7.ebuild
index 9b524bb56828..4e39f2bdd57a 100644
--- a/sci-electronics/kicad/kicad-5.1.7.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 WX_GTK_VER="3.0-gtk3"
 
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 5a6ae2bb1bf0..ffc64071a0fd 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 86ffd5a417b3..e377493e5a9a 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.10.7.tar.bz2 102154692 BLAKE2B 9b54d542770f149eb3c413ef867a012e28e4121ff38114ef954131f55dea54cc8c0d4e65a5e8eac9098fb596af7b8d2f77ddfb2f8d0170d2e1a5b59569952151 SHA512 b10d81d24c7cfb8b285b6d9884dfe19ba33b032cd843d29b879159d203454fd359a669047b677baf515d92ce331ba66f59dc2466beae2048920b2c0da0c3d666
 DIST qgis-3.10.9.tar.bz2 102418680 BLAKE2B 53599dab784fc42b7a4505e13b1fd97cdb7c696bf1a004425ea0e7b88659b9af40f74b7107ef6103a138f4bc8886eda0a99a07a1c1466fb73c94d55ea39d8ea8 SHA512 91bba01db04094a194d1437a00276f076cd88d9ebcfe4792f20da8fb4339c984262e2bf79f666cf23af13081da358bbfb69bdff086e4988701c4431f53732275
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/qgis-3.10.7.ebuild b/sci-geosciences/qgis/qgis-3.10.7.ebuild
deleted file mode 100644
index 65bdc947394e..000000000000
--- a/sci-geosciences/qgis/qgis-3.10.7.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-QTMIN="5.9.4"
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-	inherit git-r3
-else
-	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
-		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="amd64 x86"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QTMIN}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+),ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtpositioning-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtserialport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-3.0.4:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-6.3.1:=
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
-			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
-			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
-			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
-			dev-python/six[${PYTHON_MULTI_USEDEP}]
-			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
-			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
-		')
-	)
-	qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=share/man/
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(cmake_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use python; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/qgis/python
-	fi
-
-	if use grass; then
-		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-3.10.9.ebuild b/sci-geosciences/qgis/qgis-3.10.9.ebuild
index 14cb6a77eff3..65bdc947394e 100644
--- a/sci-geosciences/qgis/qgis-3.10.9.ebuild
+++ b/sci-geosciences/qgis/qgis-3.10.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 inherit cmake desktop python-single-r1 qmake-utils xdg
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index e786fcf6962f..2317a8951886 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/libint/libint-2.6.0-r1.ebuild b/sci-libs/libint/libint-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..cdda6546357c
--- /dev/null
+++ b/sci-libs/libint/libint-2.6.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils fortran-2 toolchain-funcs
+
+DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
+HOMEPAGE="https://github.com/evaleev/libint"
+SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs doc"
+
+DEPEND="
+	dev-libs/boost
+	dev-libs/gmp[cxx]
+	doc? (
+		dev-texlive/texlive-latex
+		dev-tex/latex2html
+	)"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-cxx=$(tc-getCXX) \
+		--with-cxx-optflags="${CXXFLAGS}" \
+		--with-cxxgen-optflags="${CXXFLAGS}" \
+		--with-cxxdepend=$(tc-getCXX) \
+		--with-ranlib=$(tc-getRANLIB) \
+		--with-ar=$(tc-getAR) \
+		--with-ld=$(tc-getLD) \
+		--enable-eri3=1
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+
+	use doc && emake html pdf
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		DOCS=( doc/progman/progman.pdf )
+		HTML_DOCS=( doc/progman/progman/*.{html,png,css} )
+		einstalldocs
+	fi
+}
diff --git a/sci-libs/libint/libint-2.6.0.ebuild b/sci-libs/libint/libint-2.6.0.ebuild
index a81caff037d7..774bdc758b4a 100644
--- a/sci-libs/libint/libint-2.6.0.ebuild
+++ b/sci-libs/libint/libint-2.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/evaleev/libint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs doc"
 
 DEPEND="
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 078ad48b87c1..ac52cd336778 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index c5c6ccba31b5..6da1223d681d 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,2 +1,3 @@
+DIST coq-8.12.0.tar.gz 6774001 BLAKE2B dc1d6adf9d4bd50d46007fbf5fd43d1ea97b6b226d89ad943419d4cb7df1439950c94b5e3cc614eb789103d1ab50535909d4ba2079eafc2caa4fd91db30e747d SHA512 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240
 DIST coq-8.6.1.tar.gz 5588811 BLAKE2B 1016e54ef9b42a8534add55ab057454fad35b3fe103ba877689489c7d9cf43d76c1fbee123801d91035d353a882120650f94c433d9ee1daa878b8c819609c949 SHA512 814ab76a06ca15f927081428da74add4bc67290199fa011853b9c68a00cdefaf813b10fbac18a434f4504fce8f2173eb544080bf6f50d62caa41bb8724b13083
 DIST coq-8.9.1.tar.gz 6001970 BLAKE2B f65498e2485c59f4f95d2afeac35750ebf85b5af6db7c269a11635f2414df483d4cb159557060c9118de25f4922176f54d2e5c6f12174599371348341cb4d80f SHA512 66344f801b955d1b6daf3ab1d704551070c95cf9032ae74f15fb33f7ec313812b3e05c0ec277a2eb448e3fdfd9721df06d36612e2fb4928b6530d70147f1d983
diff --git a/sci-mathematics/coq/coq-8.12.0.ebuild b/sci-mathematics/coq/coq-8.12.0.ebuild
new file mode 100644
index 000000000000..f057ce34b154
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.12.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib
+
+MY_PV=${PV/_p/pl}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/"
+SRC_URI="https://github.com/coq/coq/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk debug +ocamlopt doc"
+
+RESTRICT=test
+
+RDEPEND="
+	>=dev-lang/ocaml-4.11.0:=[ocamlopt?]
+	dev-ml/camlp5:=[ocamlopt?]
+	dev-ml/num:=
+	gtk? (
+		dev-ml/lablgtk:3=[sourceview,ocamlopt?]
+		dev-ml/lablgtk-sourceview:3=[ocamlopt?]
+		)"
+DEPEND="${RDEPEND}
+	dev-ml/findlib
+	doc? (
+		media-libs/netpbm[png,zlib]
+		virtual/latex-base
+		dev-tex/hevea
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-latexextra
+		)"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	ocaml_lib=$(ocamlc -where)
+	local myconf=(
+		-prefix /usr
+		-bindir /usr/bin
+		-libdir /usr/$(get_libdir)/coq
+		-mandir /usr/share/man
+		-coqdocdir /usr/$(get_libdir)/coq/coqdoc
+		-docdir /usr/share/doc/${PF}
+		-configdir /etc/xdg/${PN}
+		)
+
+	use debug && myconf+=( -debug )
+	use doc || myconf+=( -with-doc no )
+
+	if use gtk; then
+		if use ocamlopt; then
+			myconf+=( -coqide opt )
+		else
+			myconf+=( -coqide byte )
+		fi
+	else
+		myconf+=( -coqide no )
+	fi
+
+	use ocamlopt || myconf+=( -byte-only )
+
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+	emake STRIP="true" -j1 world VERBOSE=1
+}
+
+src_test() {
+	emake STRIP="true" check VERBOSE=1
+}
+
+src_install() {
+	emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
+	dodoc README.md CREDITS
+
+	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+}
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index cce833ef676f..83ee308a1345 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -1,2 +1,4 @@
 DIST p95v298b6.linux32.tar.gz 5696871 BLAKE2B e2c68c4dac1e4cfbc2e44542665326d33a7929585928ca720569b918f5286c97b93acc45c03d0514cadb29e87e5c6ca103e69953417df8405e36998c5768896b SHA512 6f82973237c59cd548fe7bfc08c51a62cc7ac4e98a8539e5dfbc23eec21fb6f46e1534dc834852557af61fa1a6fc9b634d9117d85fce37f8f6f9189fb724518b
 DIST p95v298b6.linux64.tar.gz 7032597 BLAKE2B de4de01d68caba4530d5adca165bfaa28cdb7e276b44355b200245cac6bab80bc05885a994c06331c2f66bdcd236c8bdb6cc8206ca40fb583bce6dc98eced7b1 SHA512 cb0ea195f4167e22bfdeef02872205a40ccd4d110abc9c354a413284db9aef1dbf9888ecdc3f09262e0d1033c0e4bed1f23d4d966fb58c437673a81095252bd1
+DIST p95v303b6.linux32.tar.gz 5702312 BLAKE2B 728c8b8e7e2b5187dc8126bccc5e2c165fbfbc0900d6c35517cd21b78e5292df143641e3766cc0146918062039b1eecab568f9b278f64b1b9197ee2f775603b9 SHA512 3e06fb77be07334949ece3ae152bdf5491f0b7f8e33e0e8ed2af3c34332841975a9514d1993ed2355abfa4e09f93e42093d02f96dc30c3471ae9f974cc2de11a
+DIST p95v303b6.linux64.tar.gz 7046127 BLAKE2B 9cde9c2670203071cfc463434a47c8123064cb232bfeb25d8767cad2c25ea75b395e2ec135b7b4a6dc9616e9d6b05ead371e1083274a82468f62a0e1de93c98f SHA512 6d6ded9a1724993d42adee28d400b0337835c52a4ce42271e62efb37134adfc6f017f55475860fbc1224e377a227ef8547b8852a35c082c37e996f4a1c1b570c
diff --git a/sci-mathematics/gimps/gimps-30.3.6.ebuild b/sci-mathematics/gimps/gimps-30.3.6.ebuild
new file mode 100644
index 000000000000..c5644dfa342a
--- /dev/null
+++ b/sci-mathematics/gimps/gimps-30.3.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="The Great Internet Mersenne Prime Search"
+HOMEPAGE="https://www.mersenne.org/"
+
+# The author has finally caved in to the pressure of putting the build
+# number in the package name. Some dark magic necessary to get to the
+# package name
+
+MY_PV=$(ver_rs 2 'b' )
+
+SRC_URI="
+	amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux64.tar.gz )
+	x86? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux32.tar.gz )"
+
+SLOT="0"
+LICENSE="GIMPS"
+RESTRICT="mirror bindist"
+KEYWORDS="-* ~amd64 ~x86"
+
+# Since there are no statically linked binaries for this version of mprime,
+# and no static binaries for amd64 in general, we use the dynamically linked
+# ones and try to cover the .so deps with the packages listed in RDEPEND.
+# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
+
+DEPEND=""
+RDEPEND="net-misc/curl
+	>=dev-libs/gmp-6.1.2"
+
+S="${WORKDIR}"
+I="/opt/gimps"
+
+QA_PREBUILT="opt/gimps/mprime"
+
+DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
+
+src_install() {
+	dodir ${I}
+	keepdir /var/lib/gimps
+	pax-mark m mprime
+	cp mprime "${D}/${I}" || die
+	fperms a-w "${I}/mprime"
+	fowners root:0 "${I}"
+	fowners root:0 "${I}/mprime"
+
+	einstalldocs
+
+	readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
+	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	echo
+	einfo "GIMPS data files were not removed."
+	einfo "Remove them manually from /var/lib/gimps/"
+	echo
+}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 4768ee9f6e5e..d894cef0ddc1 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/veusz/veusz-3.2.ebuild b/sci-visualization/veusz/veusz-3.2.ebuild
index e3edbcbeac92..54682cc5cd73 100644
--- a/sci-visualization/veusz/veusz-3.2.ebuild
+++ b/sci-visualization/veusz/veusz-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit desktop distutils-r1 virtualx xdg
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bf347bc86b7e..aa4d67c75a2a 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild
index d19788a0a630..12c3ff004ae9 100644
--- a/sys-apps/dtc/dtc-1.6.0.ebuild
+++ b/sys-apps/dtc/dtc-1.6.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild b/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
index 3d73d2db78ad..5cf31892ccff 100644
--- a/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
+++ b/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxhw/hw-probe/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 388bd7230ba8..edb354c7cf1d 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 17f02a129be4..3034bd8f52a3 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,2 +1 @@
-DIST pambase-20200917.tar.gz 3342 BLAKE2B 4dde3a6a4a22f02464a2a703a2385038c53c05398904dc47431880a16d7dd1ba89c8f5fdf19a7d50406f2487f8bdf90264ca2941cc6a2ad9d404e89c3d73edca SHA512 0cae27f7cd7ef258771b61110ba3ce5a44a0f9d71030670b2a40aa47a609d30ae3e3d7bc0649dcce25a2cfe2e1259e6d9ff435118ab1d2db771a162898ab5143
-DIST pambase-20201010.tar.gz 3319 BLAKE2B 269ae31c197cb438169111c079bc91f8c6714b4af1a1e049278c916a2975661b15ceacd8ac06cd9296a64295c876a1241ddec2efa1350e9278ad1cfa3655e750 SHA512 b37c82e8247bd2d90056877f6b1e5c0d943e75df27a08a03fc17865feccdeec30d93691aefdf99bad9618722824756f940525f9091567f71c4cbb3d511e2d745
+DIST pambase-20201013.tar.gz 3289 BLAKE2B 81a2216bb5173e5731025e864aa5031b6b4835334a2904c6e9fa2454d01ebb358fcc9d9077b9b122bb2edf4cfda8a5581802537012a423dac6546821184add5d SHA512 b159a86ed7fd0a4c8457625362d9a460bb05e57c63c85be7965dbb2969ef66fa6978b1763fc9b458bb7fe592e4df7b650ec28f52612251c3e6dff1f16ddbaafa
diff --git a/sys-auth/pambase/pambase-20201010.ebuild b/sys-auth/pambase/pambase-20201010.ebuild
deleted file mode 100644
index d7f758b33c38..000000000000
--- a/sys-auth/pambase/pambase-20201010.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit pam python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://github.com/gentoo/pambase"
-SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="caps debug elogind gnome-keyring minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
-
-RESTRICT="binchecks"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( passwdqc pwquality )
-	pwhistory? ( || ( passwdqc pwquality ) )
-"
-
-MIN_PAM_REQ=1.4.0
-
-RDEPEND="
-	>=sys-libs/pam-${MIN_PAM_REQ}
-	elogind? ( sys-auth/elogind[pam] )
-	gnome-keyring? ( gnome-base/gnome-keyring[pam] )
-	mktemp? ( sys-auth/pam_mktemp )
-	pam_krb5? (
-		>=sys-libs/pam-${MIN_PAM_REQ}
-		sys-auth/pam_krb5
-	)
-	caps? ( sys-libs/libcap[pam] )
-	pam_ssh? ( sys-auth/pam_ssh )
-	passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 )
-	pwquality? ( dev-libs/libpwquality[pam] )
-	selinux? ( sys-libs/pam[selinux] )
-	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
-	systemd? ( sys-apps/systemd[pam] )
-"
-
-BDEPEND="$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-	')"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	${EPYTHON} ./${PN}.py \
-	$(usex caps '--libcap' '') \
-	$(usex debug '--debug' '') \
-	$(usex elogind '--elogind' '') \
-	$(usex gnome-keyring '--gnome-keyring' '') \
-	$(usex minimal '--minimal' '') \
-	$(usex mktemp '--mktemp' '') \
-	$(usex nullok '--nullok' '') \
-	$(usex pam_krb5 '--krb5' '') \
-	$(usex pam_ssh '--pam-ssh' '') \
-	$(usex passwdqc '--passwdqc' '') \
-	$(usex pwhistory '--pwhistory' '') \
-	$(usex pwquality '--pwquality' '') \
-	$(usex securetty '--securetty' '') \
-	$(usex selinux '--selinux' '') \
-	$(usex sha512 '--sha512' '') \
-	$(usex systemd '--systemd' '')
-}
-
-src_test() { :; }
-
-src_install() {
-	local DOC_CONTENTS
-
-	if use passwdqc; then
-		DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
-				page and then edit the /etc/security/passwdqc.conf file"
-	fi
-
-	if use pwquality; then
-		DOC_CONTENTS="To amend the existing password policy please see the man 5 pwquality.conf
-				page and then edit the /etc/security/pwquality.conf file"
-	fi
-
-	{ use passwdqc || use pwquality; } && readme.gentoo_create_doc
-
-	dopamd -r stack/.
-}
-
-pkg_postinst() {
-	{ use passwdqc || use pwquality; } && readme.gentoo_print_elog
-}
diff --git a/sys-auth/pambase/pambase-20200917.ebuild b/sys-auth/pambase/pambase-20201013.ebuild
similarity index 100%
rename from sys-auth/pambase/pambase-20200917.ebuild
rename to sys-auth/pambase/pambase-20201013.ebuild
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 7c71f6a62ed0..084d0a2d45ed 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/gcc-config/gcc-config-2.3.2.ebuild b/sys-devel/gcc-config/gcc-config-2.3.2.ebuild
index 265725ac2bef..2c290910c1c9 100644
--- a/sys-devel/gcc-config/gcc-config-2.3.2.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.3.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/gcc-6.5.0-r3.ebuild b/sys-devel/gcc/gcc-6.5.0-r3.ebuild
index 6ba0552a039f..3ff6da13ca37 100644
--- a/sys-devel/gcc/gcc-6.5.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r3.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="5"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gdb/gdb-9.2.ebuild b/sys-devel/gdb/gdb-9.2.ebuild
index db11e62d03ab..4da1c799b109 100644
--- a/sys-devel/gdb/gdb-9.2.ebuild
+++ b/sys-devel/gdb/gdb-9.2.ebuild
@@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index ee2e2ad88a9a..ed35ac5564db 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
index 2366fe02e7d1..6b7b4fcd3a35 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -42,7 +42,7 @@ else
 		binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
 		https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
 	"
-	KEYWORDS="~amd64 arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
 	IUSE="+binary"
 	REQUIRED_USE+="
 		!amd64? ( binary )
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 553d2f1f2c1d..279d1e5a62d5 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 8641ef3ef80b..60bfda077212 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -22,3 +22,6 @@ DIST gentoo-kernel-5.8.13-1.x86.xpak 56174425 BLAKE2B 87a7047433b196c087bc4d1bb4
 DIST gentoo-kernel-5.8.14-1.amd64.xpak 64154937 BLAKE2B 4238b440b83b43149d73deade748400ee5bbfbe97d8da670c37e4701bb557579a9db9822f1c1d2143a89bcc0194b39c2d06910a48886560968e5ebcfe9807572 SHA512 db3d8da7d511205dcfd2ca41ef3e3952ceadbb5bfd5ade189598c9cfd5135b55699ef6dc010dde49a17ac17a572c248be16f0d9fd472b3f1b897d17d2cb8e557
 DIST gentoo-kernel-5.8.14-1.arm64.xpak 60542375 BLAKE2B 53543d5e492cbb08f30c72864d84b8c70813282088a25ff270717b0669ddd8e529086636f6ba76876e75797d03387740c4df8a0b3e74daf44e62307b002eeb3c SHA512 6581776fc60688862d00caf4c136de83f0ff7e909c55f2410e310e9f417b7fed7b05adc2b4e4ca47008d63977ed23072cf0b2882b7416d2f6b55bf42a3e95a03
 DIST gentoo-kernel-5.8.14-1.x86.xpak 56176613 BLAKE2B f497efa354a9ccfb0869aad18d5cb33f3f1ddfd541265e2ecffa8d2eda0b10c8d0d6213bd8bf620dc2a05e1c6629d0f682fa7c2c2c9c5257b0f45c308ae11ed4 SHA512 4de1db79189fda9099da85553e463cdd05cbe5791f6bd99b2f6eaf138a2d6026b06f11436450333b29ca4d697be9c413f3ee9c99fb0cbd91d1d5dc26bec839d9
+DIST gentoo-kernel-5.9.0-1.amd64.xpak 63354336 BLAKE2B 2769d1ffb47b738d94ccfd2981ad483543c1c4c45ee5155dc92a457937a37ddaca9f65dd67e0ee89bcd80c090aa31c5345cbbbe68c439c9a60be97a3fa300c5a SHA512 9e484ba8c9eb1978cb03ae3a94beedc5b82414cf82fe86b8f66c84612991321080fe8ecc70ef659659a0eb553a5736b630ad694b863b51e00a374149a74aff47
+DIST gentoo-kernel-5.9.0-1.arm64.xpak 61438922 BLAKE2B e239043ff2871e6736a0505859541c59d863e08498b0060a24821a69baade5f69dfd93fe671e8a35e1fe2ead3af63d18a082682a9d6afa523208134d12a420ac SHA512 a92670b5b95f512d016f32af3416472f3dafd478fc3806f91a58fbbaab3d487ad2a12441abe69ba446925249aae0a6d73b9e2ab723c7f7288322b39d63a976ef
+DIST gentoo-kernel-5.9.0-1.x86.xpak 56578276 BLAKE2B 2fd240f3bed248344144d05dcee4b14aa745e92447fa81428e1a7d6ea3cc235cc574640e6397a96f2debc5bdd96f9e9ea20f6b38f9b7bf7bd6a6c78ca0446346 SHA512 f2584932c839944bc4ec96d08db8b1c87c957de35e83c10a0424f253391f1268c4e1a6a06d1ed1d7e3e7da59a3e74c118a025c58dc0052e1d96d82b58d8cafcb
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.0-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.0-r1.ebuild
new file mode 100644
index 000000000000..ad9181bc4960
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.0.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.0.ebuild
new file mode 100644
index 000000000000..dca6aedbd789
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index d6d1e145ffd3..3da7c30cde73 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,13 +14,20 @@ DIST genpatches-5.8-16.base.tar.xz 525416 BLAKE2B 53b0e2548b25b93999650cdf8eb920
 DIST genpatches-5.8-16.extras.tar.xz 1772 BLAKE2B 60238a48924010a7ebe1214de7835522ad1ad5b156dd3bba13d315ad753f69ce7b82a5265bd4f8d8631699304526fd44279ba27413f10cc4f19e1a60880cf30b SHA512 f9760259d90cae491252c409c6521ca5285bc0f7655795055db8bbf7c5e2ca65948ffc5541d2c4499f6255e4462884a90cc3b2db485f37e6133ba03c1a519751
 DIST genpatches-5.8-17.base.tar.xz 547680 BLAKE2B ea21c869fba01bfa213444c19deb4e8c3bf312746ec0b17e6f407dac00e8c19c6d60e4e243ff5e16605b413c3aa763db9a8d91907fbd57c7443ef48b7f93a344 SHA512 7d66e6cad6a4aea50fb996608c45896c52cfb1797da24a486c9cfd0afd3121886fdba4ba91a044af2774c92805232ce988bd0b82cea0618c29c17f2cc3407905
 DIST genpatches-5.8-17.extras.tar.xz 1768 BLAKE2B 937be9f6fb92f23e8604b609de34c6f51e8e873203c9f7e6dea545f213d4be90e3d0c173b703bb6956c6d79097ea0f25528bb249a22d7edcfaec1be8f2ca636e SHA512 3409282b77cad9c06d13f814d1904819ea967b2c499c64a03bc188ca31aee991b7100946324c719d35cd4e5e30072f33e9e7ebb70986e1d4d386c47ab0ce8577
+DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
+DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
 DIST kernel-aarch64-fedora.config.5.8.5 215148 BLAKE2B c71380f46c1b37e9e17bab6d78907114369b377bcbdb54afa2c35b6a222937fd061f25309d8de0cc78ef2329ede7192722270acceeaa3da4629a5f58d8fee809 SHA512 e86e2c60e88b1ea5968db1a471d7d928ccb3146fe850f8f2813ef315f2de0cbfa0daa2f6828dee71acb2299f65f05fc0b6f1572a82fb146ae9f53a905fe94e97
+DIST kernel-aarch64-fedora.config.5.9.0 217558 BLAKE2B 38e3c31b710c30d29dbf0b5304c2b9e0615af08ec11a01318bc0c4811b91a0803a96483e986f3dd83369b14e9329bdeb0e0d834761af9a644d831eba43eb910d SHA512 d38d05aef2a809207a186eacc365118d68e7ef82939b45ac5b9038cb493c771f8fa10009a0082f36c79c2e6b5b2ec193a6b1f50bc51a6190b77f57ab7cf237a1
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.8.5 199121 BLAKE2B f6e16e6faac6e730eb4c9c3edc1c173b2988b49fe677d34ef1540541911b8f76e5bdc166327d73237c78c1769d484de18864044c91b7da253795506c674d7303 SHA512 0a2c9abaae11ac1ec2e43da4b53fd1731a9bec983a7fda7b9e20f1d25b816e6b0bd217b255ca95b02a8b6530e923b4fc7de770f6a66411045712e7de61d431af
+DIST kernel-i686-fedora.config.5.9.0 201027 BLAKE2B 1939ffac8baf290e9c0ab6bff25a365af8c674b360e3adc5e9bfd710473abbd38a124f5279b2259cbc0c9345e0ca5b667c67324b194742693561c91528cf1793 SHA512 e5ba77e899360cef9dc45a5b5baf646aed04fdeb771727a6696f156bd0aa8aed4dbac13ffd78779e1b1ac657c1f9569bcb2d0c3bcd4be2063d7a1b68e6aab983
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.8.5 185766 BLAKE2B 27330c7806923eb4a3346df2abb5f253ca044a02afe72a89c6ce006d149966d65b4ba3e114b5ebefae987565279510c05d33dbc89c36c5e78e2e88732f5125f2 SHA512 8b621e0584624ccc24580951fc116478506a7465715449a53e70f46c99d0210bf08063a4fd5b87e4624f5ce179e6a6316f23723839c0e64e57a2ee58e4de59fe
+DIST kernel-ppc64le-fedora.config.5.9.0 187611 BLAKE2B 0fcf6d09edb2afbaac88e8588bf3f0daba4a6b810ab3d88121c1c55790b8dabe24ab02f9b042b775a909e29d3e43b7cded8120417823712409d3388a93ad5996 SHA512 cb76b2a140a8362c1925a4bb8d048990feb81c625da95f170d7ab986fc0d0cdfaef79acfdf4e5f167fc70efc42da80c1038ee37f7ce3bbcd3782c5beed6607f3
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.8.5 200052 BLAKE2B be804fd499527a6c6927365c0350b51b3351da9a4e3f75bcbcc44d1a1b21d001d4907e6028ceb7ec6d5c812ea190d369ca6de4ae2c21a293342b6af33b8e5e65 SHA512 40ba21b0597702d3cff9eb3c1fab98784229ba78702bbb0fae2264b145a2e433615522e300cff1f9c9c52067431116b80a8db92e1263bd1a9070adbbd068f982
+DIST kernel-x86_64-fedora.config.5.9.0 201958 BLAKE2B f210399099661f9f643b0b1fe6cfd82675fb71b4c63c8ee07645771960df2936370680e704b1494c6e66ff570a4a4dcd2c16ef521be4a29c21e1b12abbf71875 SHA512 f9c7ed7b9a8c351c841b527c352a72aeb36ed368dcf9060ff2c4c92364419cc256752d3fde76593d177cf40389a2b9dd9ac7bc05462539433d3829a429b74eca
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
+DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.0.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.0.ebuild
new file mode 100644
index 000000000000..e7a5b2ccc317
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.9.0.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.9.0
+CONFIG_HASH=aa6d9438d030fa4682d5d450481085c901503da5
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# replace (none) with gentoo
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+		-e '/CONFIG_KEXEC_SIG/d'
+		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
+		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
+		-e '/CONFIG_SIGNATURE/d'
+		# remove massive array of LSMs
+		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
+		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
+		# nobody actually wants fips
+		-e '/CONFIG_CRYPTO_FIPS/d'
+		# these tests are really not necessary
+		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
+		# probably not needed by anybody but developers
+		-e '/CONFIG_CRYPTO_STATS/d'
+		# 1000hz is excessive for laptops
+		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
+		# nobody is using this kernel on insane super computers
+		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
+		# we're not actually producing live patches for folks
+		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
+		# this slows down networking in general
+		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
+		# include font for normal and hidpi screens
+		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
+		# we don't need to actually install system headers from this ebuild
+		-e '/CONFIG_HEADERS_INSTALL/d'
+		# enable /proc/config.gz, used by linux-info.eclass
+		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+		-e '/CONFIG_DEBUG_RODATA_TEST/d'
+		-e '/CONFIG_DEBUG_VM/d'
+		-e '/CONFIG_DEBUG_SHIRQ/d'
+		-e '/CONFIG_DEBUG_LIST/d'
+		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
+		-e '/CONFIG_TORTURE_TEST/d'
+		-e '/CONFIG_BOOTTIME_TRACING/d'
+		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
+		-e '/CONFIG_X86_DECODER_SELFTEST/d'
+		-e '/CONFIG_KGDB/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 1495ed7cfa51..ab92a66c63a4 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -1,19 +1,12 @@
-DIST genpatches-5.6-2.base.tar.xz 4452 BLAKE2B f21fa14e4a15f23495eae455d0fa38e22c8b8d6f435674f0a6dc70c9005ed314f9ec986277cc04f206d4c8f9c3ed2ba99b5d98b0fd2c15b74299d0bc2fabcaea SHA512 b4ec4930a81e2e50c5d960276cf5d273ae44d33d10de0d4a316ca03b5b7104c36b6b8ac9b464102e23c57391c7101d8d9189d6b45519c0c2528446d4e9ecaf91
-DIST genpatches-5.6-2.extras.tar.xz 1744 BLAKE2B 1a7b68366c1b4ea01c670bf88f95624baaed6e4366dc311fdaab76f483b944df62da5485760ef546641a598543d6f0d8686c77a1caf4b0ddf2e67ee63a36879e SHA512 6d388ed21866c0ab3d590723644ba0826c8c6212f6a10a7df2f5579e1c5a59bf95c2b132265fc2cc99b90fb839ec2cdffa37d702452aa06fae9feff161ed2733
 DIST genpatches-5.7-1.base.tar.xz 5168 BLAKE2B 506ed0fe3ecf7891c0fa89467437ec665b91a5d476832f567702d42aa0216b5c738cfed235e990f66244d8dbcd3c71ece1d4b280638be2b62412cb9fc2ae05c0 SHA512 bf14433a31b131bb74c1abb1151d021074015a6ed28c88bcb56430e9502d54b450bed1c066c9cd4870da2f1642cc065f2a5d027cbf389b705cea72ad3ea8e2ab
 DIST genpatches-5.7-1.extras.tar.xz 1764 BLAKE2B d455a21ce5f37b37861747a71d55f16e9983d82ddbfc51e65f6401384b7415dff3afe5491f9ff5344e9b6ab33b760e647e3e4075549211c1a9d7d2249baa4f98 SHA512 0215ce69c03a12e5bdddfcb61ad1ef9cdeb7b2016971d439766bb2420142b9c960fefedb4f85edef73172203961be9fa01c70cb76f72e9b1f4edb299a6a14067
 DIST genpatches-5.8-1.base.tar.xz 4268 BLAKE2B c1c4959758d0bc28213e4fa5c73014bad00144a92d37ed4f576f45d4d578c470c61080d941358d16b426aa17893bd80c88734b65beaa0afd90baf5d78cd078f2 SHA512 534e92071e33fe03049b0f1f3ec7d3e670155a2fa6e93dd1bb8cd5ca0f817549fa9c0b6c5ca06020d7b3733d53204ad79d909d5fbcbc748f218a9f799cc3be6e
 DIST genpatches-5.8-1.extras.tar.xz 1764 BLAKE2B 35c7218e356715ab544b41a7a91e90ef8ab3ad6f318e0026e835eb007f07a48c82164928750d337d238c2717ebd609a075caa03acad92b538e70bacc131d772c SHA512 823feb9f57eef7b72f899c9655ccc2da285d66fba5ecb8e904f991d9d846f5894ae24b254917a430ad7b2358c8bb6aba8b82fb5d63081c8b54eb5c96f4c3354c
-DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
+DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
+DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-DIST pf-sources-5.6_p8.patch 1877703 BLAKE2B 07c39ade7484c84a2b9a496f989a0ff9241f5957cda64e9fc70c1f8a38d936531f648a12a5963288be5cc29a977f785cf97d74c1639b014083a486b3073b1052 SHA512 e9e18e120feceeb37d8405347a7df98174ecf28f0bb30be5882711459ac19ef0af81a2ba929634b907ee01fdfd4ae01bb73d832cac4a3e0ac15cec8dfd5c1e61
-DIST pf-sources-5.7_p5.patch 2473444 BLAKE2B cea4b7f888e2ec76dde07310ab80bacfdc37f4237d26aa62ffd0f052ab7b432cf5be254c3c1311e610ca67ddd90b885723707b5af8381466736a67cd0051c103 SHA512 a10c3b1881c4783f02b412bd82e7aeb4bf9d8b3f323161b436585e97aa9a5b75abb39dda90c95833bb841193dc93ca40524bfe91f976d3e4e474f6a875511a97
+DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
 DIST pf-sources-5.7_p7.patch 2471776 BLAKE2B c87c9a5f159967877a2858da1af919332aa9ccd49c2029950b31bcce592b9e802c4d5d5daf2f86929bf9318aaa455d879d3eba21904ab38e5615f05742934a98 SHA512 11c0f0021c1d67f65461a74598ed355309c5bdea8d8c94a8e59bcdff2a8320f9504a4457dd8adddcbfc85cd753bff6018ab9a093cfd7d70dcfee4a2f82110d30
-DIST pf-sources-5.8_p1.patch 176978 BLAKE2B 80be84087ed65f0de42f9e70ac2002bcd77dfa756a769388ffcdd559aa5a7b0280725fa0ddb590cce90825beeeb55939a714f510e723cd8b0ff8ec400cd805ef SHA512 4ec9d5990f0a25666198b6be26bed0c87e5ce3fb3541c03d3b853b574ee7c0294c7f7f3c692b469f2519b38f918a214afc2b908c117578a7a4436caf2f3929ab
-DIST pf-sources-5.8_p2.patch 1071081 BLAKE2B e6c5f85607b7483ee711bee6b62dae5fc1dc44c85ef9bf107dfc997a31f83258624b748511a5bc8c2f76e3bf120779123187cff4721062c717c4eb713d5416e9 SHA512 df3c6da9e0700af7d6126af5831fa6d9a06594a31520f3dcddd098862606262cb139c8e513ffcbe1c8c4ee8e60bb3d6c4a0f505f806e02a9b779410656d4cc2a
-DIST pf-sources-5.8_p3.patch 1248429 BLAKE2B acf0911cd8b9c356bcafe754e54e982a6f749800c01795fa9ca4573a932e366185378e41a649150718ddf604e787ba85d22bec134d106c2fb44aa35262a32d19 SHA512 01cb5fd69560220c61106508585db4970164dc27b373aee03b5b9a14a30af5b04534095b9f839228f5a9bf4139f8d6e0b8b978ca2ae1b6c1e873cce782c7e9c7
-DIST pf-sources-5.8_p4.patch 1896149 BLAKE2B 1d036e1d4605372557e110d829edbfe03bbe76367b122c3081c04bdd13eb17d3c6076eebe674b957a31d8909170d0cd667692f37f14d47030f72687ccdbf38a5 SHA512 94c0a51973788a26a2130abbbda1bbcfcc8ca8f43ed8bdeed5ff27989baa886b5501b392c2aa90ce833d8b729c32fce55dced1c635e2388395967efff848d997
-DIST pf-sources-5.8_p5.patch 2141177 BLAKE2B 5d55ced84a31fa86d80d2e9ff694812b073ee2799a0685455c83dda8de7bb5b9231d590673092e8b1b6301a3e87f8089c656879d323524c7f76d3eade9000bf2 SHA512 6b2948aee3bbfebc4e7b4c46ead91987f5b2690b91e7ffbeace2b78f6455555ef36f4557fd88c82cb302b5fe389d8e9d786a1ec4d2d226780357760dc6024970
-DIST pf-sources-5.8_p6.patch 2337599 BLAKE2B 8ea69321cc3d7d9b63d67823c5326e796f9d09e39b29cad9eb0500f025b9c7dad71a20bc8b702815fb1c3dad1846e63e95a916114901fc519a2f8df120d4ca3a SHA512 10ae0bcb7b99bcfd20153f037128f4fbd127a9196ef3f346a328fbd12df38ebb61987c577b7e8846f447ed4b6acd448a69f62bab9680b6bc381d8b48d670073b
 DIST pf-sources-5.8_p7.patch 2546471 BLAKE2B 9eae65836ee0a4e67737462325753b6201c40fcf93f99a114e929f9557fb7bcf9ea619c2502f7824db6bdcf96c7a7640ad0cc1ff5dafa494a532e6f9ee4964b2 SHA512 0449f4ac292d8b0ac6222c273bc535acae5b1e8bdb9c6d196098d61de78fce6739911094bc8f710e4ef3ec187964ee8a146aa09c87f241e816ef5515272059eb
+DIST pf-sources-5.9_p1.patch 35818 BLAKE2B c28c292b527c1116b927861dbcdfb948e1e7d30018ecacfa89425fb0b357f2a2cb93daa681ad6a940f936b255453770c743db2a95f8ad67bd6ab772febae7a76 SHA512 82f5583fdb8862a628265f188473fc2cfaaad1ffb06292248a69fc012058f743906aca7abcd88fa223e32f0a626748ae8111fa6858629182d0482989a0f7f725
diff --git a/sys-kernel/pf-sources/pf-sources-5.6_p8.ebuild b/sys-kernel/pf-sources/pf-sources-5.6_p8.ebuild
deleted file mode 100644
index a240714a7259..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.6_p8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux
-# updates
-K_GENPATCHES_VER="2"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-inherit optfeature kernel-2
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Temporary fix due to 5.6 iwlwifi mess
-	find "${S}" -name "10*linux*" -delete || die
-
-	kernel-2_src_prepare
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.8_p1.ebuild b/sys-kernel/pf-sources/pf-sources-5.8_p1.ebuild
deleted file mode 100644
index d2e345cf5fb4..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.8_p1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux
-# updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-inherit optfeature kernel-2
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_prepare() {
-	default
-	kernel-2_src_prepare
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.8_p2.ebuild b/sys-kernel/pf-sources/pf-sources-5.8_p2.ebuild
deleted file mode 100644
index d2e345cf5fb4..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.8_p2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux
-# updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-inherit optfeature kernel-2
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_prepare() {
-	default
-	kernel-2_src_prepare
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.8_p3.ebuild b/sys-kernel/pf-sources/pf-sources-5.8_p3.ebuild
deleted file mode 100644
index d2e345cf5fb4..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.8_p3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux
-# updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-inherit optfeature kernel-2
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_prepare() {
-	default
-	kernel-2_src_prepare
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.8_p4.ebuild b/sys-kernel/pf-sources/pf-sources-5.8_p4.ebuild
deleted file mode 100644
index d2e345cf5fb4..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.8_p4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux
-# updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-inherit optfeature kernel-2
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_prepare() {
-	default
-	kernel-2_src_prepare
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.8_p5.ebuild b/sys-kernel/pf-sources/pf-sources-5.8_p5.ebuild
deleted file mode 100644
index d2e345cf5fb4..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.8_p5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux
-# updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-inherit optfeature kernel-2
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_prepare() {
-	default
-	kernel-2_src_prepare
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.8_p6.ebuild b/sys-kernel/pf-sources/pf-sources-5.8_p6.ebuild
deleted file mode 100644
index d2e345cf5fb4..000000000000
--- a/sys-kernel/pf-sources/pf-sources-5.8_p6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define what default functions to run
-ETYPE="sources"
-
-# No 'experimental' USE flag provided, but we still want to use genpatches
-K_EXP_GENPATCHES_NOUSE="1"
-
-# Just get basic genpatches, -pf patch set already includes vanilla-linux
-# updates
-K_GENPATCHES_VER="1"
-
-# -pf already sets EXTRAVERSION to kernel Makefile
-K_NOSETEXTRAVERSION="1"
-
-# Not supported by the Gentoo security team
-K_SECURITY_UNSUPPORTED="1"
-
-# We want the very basic patches from gentoo-sources, experimental patch is
-# already included in pf-sources
-K_WANT_GENPATCHES="base extras"
-
-inherit optfeature kernel-2
-detect_version
-
-DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
-HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
-	https://dev.gentoo.org/~mpagano/genpatches/"
-SRC_URI="${KERNEL_URI}
-	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S="${WORKDIR}/linux-${PVR}-pf"
-
-PATCHES=( "${DISTDIR}/${P}.patch" )
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
-	see: ${HOMEPAGE}."
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-
-	kernel-2_pkg_setup
-}
-
-src_prepare() {
-	default
-	kernel-2_src_prepare
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	elog "Optional features:"
-	optfeature "Userspace KSM helper" sys-process/uksmd
-}
diff --git a/sys-kernel/pf-sources/pf-sources-5.7_p5.ebuild b/sys-kernel/pf-sources/pf-sources-5.9_p1.ebuild
similarity index 100%
rename from sys-kernel/pf-sources/pf-sources-5.7_p5.ebuild
rename to sys-kernel/pf-sources/pf-sources-5.9_p1.ebuild
diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest
index 06afbf490a20..f0d1c539d140 100644
--- a/sys-kernel/raspberrypi-image/Manifest
+++ b/sys-kernel/raspberrypi-image/Manifest
@@ -1,3 +1,3 @@
-DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174 SHA512 6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522
 DIST raspberrypi-firmware-1.20190925.tar.gz 185571086 BLAKE2B c3a9b2760fa853fbd1dd09bc4048c9e78594f88da5af608c3a761554d4046a4c869db8981c64140a24e82e0a61b8dc776bb8d895df60c6424e44780f78b18cb0 SHA512 4b7b29cc6c2a33d7a37987c492034d9afbb2220364c50cf265e0adf8e5f393c2275dcffaa77c89b3f43b2e98d199741b67590cb60ff8beae8ef677852f63b4a0
+DIST raspberrypi-firmware-1.20200902.tar.gz 187144306 BLAKE2B 33a9449fd98fffaa80a9c748f8dd246db491b4f5eb1335ffd10bfacdbe4396c2faabfe522129d287663ad5ef0e9322bd7302a74d6d874e9125f165dc50b81d90 SHA512 91d084d2dba99219b72cc03d49d9546e070477d35fa151b42e204ec6b77ee76a8774235cc32cec8c3aa4360b7c1922dd1c65da8489300476290af87e167f0c79
 DIST raspberrypi-image-4.14.98_p20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-4.19.57_p20190709.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-5.4.51_p20200902.ebuild
similarity index 63%
rename from sys-kernel/raspberrypi-image/raspberrypi-image-4.19.57_p20190709.ebuild
rename to sys-kernel/raspberrypi-image/raspberrypi-image-5.4.51_p20200902.ebuild
index ecd30c095746..dd284762191f 100644
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-4.19.57_p20190709.ebuild
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-5.4.51_p20200902.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,12 @@ LICENSE="GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
 RESTRICT="binchecks strip"
 
-RDEPEND="sys-boot/raspberrypi-firmware"
+# Temporary safety measure to prevent ending up with a pair of
+# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
+# both of which installed device tree files.
+# Restore to simply "sys-boot/raspberrypi-firmware" when the mentioned version
+# and all older ones are deleted.
+RDEPEND=">sys-boot/raspberrypi-firmware-1.20190709"
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -22,7 +27,7 @@ else
 	MY_PV="1.$(ver_cut 5)"
 	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> raspberrypi-firmware-${MY_PV}.tar.gz"
 	S="${WORKDIR}/firmware-${MY_PV}"
-	KEYWORDS="-* ~arm"
+	KEYWORDS="-* ~arm ~arm64"
 fi
 
 src_install() {
@@ -30,4 +35,7 @@ src_install() {
 	doins -r modules/*
 	insinto /boot
 	doins boot/*.img
+
+	doins boot/*.dtb
+	doins -r boot/overlays
 }
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 5f48633995c8..114b2a421cc7 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 7b43f67a73a8..8da2967d0fa1 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,3 +1,4 @@
 DIST opera-developer_73.0.3820.0_amd64.deb 72042252 BLAKE2B bc2dd709212c6a26208fac5d1eab246b33ac669a5f593c630ec4c379fc7330bc51485e59b3f981ac314dbf5a1cc4e033b732ea3318103118d76b021b8e6dc62a SHA512 d51eed335794dd5aa64e0300f873a8f202c1733512e192697104089a6bc57ef51ee321843044553f26444e1f649026728d66f847936d983f92c6014f68c2ec8e
 DIST opera-developer_73.0.3827.0_amd64.deb 72518736 BLAKE2B 14213c23f1e170694e9b5ccbf04755c0244988918b9c18fd733b64c656827e0d477e916ad02af61c20252ec53d5be06881bed1b8159bfbde20e4339b4ff64dfa SHA512 9b26341ac053674a8461826c221e44c2ee4833613ade0aeb1ee12ecc112418a720c9db14f7165812150576266937ec5c021ed561ad0706672a77df099418a8be
 DIST opera-developer_73.0.3834.0_amd64.deb 72418344 BLAKE2B e5d03ec7d669af896979f46c8255b06e8832de8ea45eb1c97c5f8e6e960a6b172be33259dcf6bd065666ca427dea3b917e12515055a3bea6602128c42b7faff1 SHA512 755610a2f2ccb56c1a7eaa5f2aa491a6dedd1febccb0f46c7cfaa6d60990ba5846b6b145a26be8588594b6f13a9fe0f926372722515fb549696af24ab990816f
+DIST opera-developer_73.0.3841.0_amd64.deb 73175952 BLAKE2B d890cf40a775e2d63f2ffbf0cbef898fc5e70f5b9798866052f19e909327ae53f654113089e4353fc06ca9e3af4c2942b4788cc757f9dadecbb873368851a0f2 SHA512 a6fe15690d36350406fc46f03f1a8b60063684a2221621f406220627f2f537cb9a7c208688d054daae2f00768dd605dd07ac9192e8a2875f26a86930f59dbe20
diff --git a/www-client/opera-developer/opera-developer-73.0.3841.0.ebuild b/www-client/opera-developer/opera-developer-73.0.3841.0.ebuild
new file mode 100644
index 000000000000..c6ec6cb96a08
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-73.0.3841.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker xdg
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/wayland
+	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/libxkbcommon
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+pkg_setup() {
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+}
+
+src_prepare() {
+	default
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index fe64cf09f5e7..28949001a860 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,35 +1,15 @@
-DIST vivaldi-snapshot-3.4.2035.3_p1-amd64.deb 72616764 BLAKE2B 70efb42f082eb3bea0e90e3fbe8c6d75a910a5f29d367f37450b1ac079ef7b7fc49177aedcbdf7406e532204027dd27d6bdf7405186d5d39c711a8d6b916fcbf SHA512 c6d70a0c5fce6334dbb3aefb5f66b5cdf9fb3bbe940488fc01bfa8f939a16c7b37951a86016363e52989e55b2bbe37f30491d3cd339672314055ffaebe3d0d90
-DIST vivaldi-snapshot-3.4.2035.3_p1-arm64.deb 65360100 BLAKE2B c777f9b68c4fc602f0e7785ec28ef2534390da55cd93d31356cba4d60130eaf471d40ded33526cbe66b48c0757b001fafdd0d7f23839d19e1e73d6bb9238c0f4 SHA512 9ddace0c66ead92d5cdd66f18e491a08b1d215d7d43b4aba09e84bfba2066ddd4d7ec5c6d447ac05106a81404643415ef2ebf4a52757bc0ed24d53401ef9458d
-DIST vivaldi-snapshot-3.4.2035.3_p1-armhf.deb 64379992 BLAKE2B 625fb859b6edb15412fb9a6a012f12eb7b36a547de3651021215d9e21c59419f391b7f377c329bc09360d03c37fa164073fc24ba190f4da644e727e26a14cd59 SHA512 c6278ef40e2b93b63b9627385d24606901a6134ee197ebc270d63fe5db625db36efde9ab76c30389d953076b07137cbf2e3664e7389e4db6ab6b100783f976df
-DIST vivaldi-snapshot-3.4.2035.3_p1-i386.deb 70889216 BLAKE2B 8212681518cc6f5a4b6860380a7c9129f0345b775a45d0ab08ecf12aedafb57c622a483da5583f848d35da36bfb7bae4e3ed0ae6a7cd53abe50a7e0229903622 SHA512 8ad9dbf0d56b49fd2600793f1a8aa0454b911dc3f9933f640e4233798acc33b0503b2df85f6c9df6dff9cfcd6cca7445c5f37133a1fc83868a65fab96c81ee86
-DIST vivaldi-snapshot-3.4.2036.3_p1-amd64.deb 72609260 BLAKE2B af147ed659125f6269a8950d280eb43e73d2cc48a47efc5b4e5d82b6ae9b348f798aa16694bf065bd61a5f377343f1e8cf6cf86ee7f91ea4242d3fc4bea07c74 SHA512 b4e5a5e5faee24ae85594a6609e4988bf7474766f56715523a358aea10b35ae434d5560e769a0e6b6b230611ae562748f5de30c5b2c9d82e4fd13ec1dbe6442d
-DIST vivaldi-snapshot-3.4.2036.3_p1-arm64.deb 65358424 BLAKE2B f49de7021b12486ecb1c632f41248a8bbc47e0988a23eed78050977681a018c56618ebe3fa79a4b5a5cfa8a2cbacf53a85524cb2069512d1fa07ca16686fef19 SHA512 1e6bb15e8ed66aba15d900172014d315d1a1a3b020e0d3cdef9cc55fbc8918799e3928dc2d9b95585b39ed5e62db5f75e1e9fbfbcd8ef1f9ce99548f8abf894d
-DIST vivaldi-snapshot-3.4.2036.3_p1-armhf.deb 64386640 BLAKE2B d2981641ea25f510e2dafdb94fd222056d6e8c0682b02da2bd934b3d82b0c1cdf844154a92f9588cad42b43c7aa3e9539ee1f883cd19794d061e4c32df0df17f SHA512 8f4b1fc93969033195e9254c6af215933ec97b81afb8946c21989eedccf9fd21f6d45082824739a238dc18758945ad60b7618fa5b74eac56a2c48dd10b460bf5
-DIST vivaldi-snapshot-3.4.2036.3_p1-i386.deb 70905896 BLAKE2B 68ea6bbe636a013aa2755d1093de429af888977c6ece103f8a278c9588c83cdf6eaae6ce929f1b7f21ece4acbc23a3a796a3ad37c8906be3b0dafb659cb3e735 SHA512 f95f3316a56186a9bce5f5fd5a6169070763942e76ca3d00af6167e95bbf4adedf06128be3e4814eb5780da2716b428b4be44add0f38611824236e6014656c7e
-DIST vivaldi-snapshot-3.4.2038.4_p1-amd64.deb 75820936 BLAKE2B 60a31d0e1a4b5a84744c15218e1d1d00613ba0b564f138e43d6576a49d815b710fbb836949d4649589f5fda5c4c5c356166428b18c6848e6b68ca30ecb44ff22 SHA512 8da93b1b73e560add618b883e5914bab9293a8bcd4e7e8564fa2f54393797cfb742648a7b45fce3aa1acd5d0a1ebdc31a513b18a6c5429fd4034deca0cb63101
-DIST vivaldi-snapshot-3.4.2038.4_p1-arm64.deb 69128664 BLAKE2B 9ad581e07dc5edb467bbd518fa28edab3c481613fc2204f2c419f6bcc43b28109f6c2311e8556c980209a030fc8c24d5d5a5f4cdf2b769b009802ce1b4f89dae SHA512 2821c4617f6aa4eb0e48ec4fe1e0772dcbbea1368484e9bfc1e83fc1d9070ee48cb63dd2b606b65d366384393ccae5f691e0a0be8b5aca0aa11a3f931ec919e5
-DIST vivaldi-snapshot-3.4.2038.4_p1-armhf.deb 68167016 BLAKE2B 90cd1e2f3fce532336c14347a5f7dca318a970c07d0c199270e21835208bf58c793dea5a1fa50d158e3b59212fdff65fedef8a8910b42500c74126ee40ead3e2 SHA512 3576175e00311a6a07994910fcff0f177ec3f675be0d24ad6164310bbf37e064a9c513c37a004141714c5bc194951f4d2524d4a291d587df6780a3860f233e4e
-DIST vivaldi-snapshot-3.4.2038.4_p1-i386.deb 73993612 BLAKE2B b624959013d81360e056de4cf596bca5efe5557f67587d13c1c48bf1ebf522a6be13fde2ef24cdb788d67688db2ed942d2dd4d5f24318fc9c459aee70a5d4d6d SHA512 a88b75a5dbf340c4fc951f75fefcbed5dc49bfb0b4480d8ccdf97415dc4c2c487bef3824f2d578dde57a983b49376e189d6863c9700dc0bd7683a0a0915e8558
-DIST vivaldi-snapshot-3.4.2049.2_p1-amd64.deb 73500204 BLAKE2B 77ddd6b14291a85751bb411fd0c31985ba3ab448bde5f45f371342a1bed59b45d7199ec38ef3a414b62a62bf88a23ce074363f4b5ddd23cfcabd015a6c47aef0 SHA512 6e1a3fd8090793028a36e9983a5885498b89afb39b062217ba409c49cc19b00d544bf5af1baebe9c097b3f0bf560d4cbc7a261c75498de87e1ac548ba475eea2
-DIST vivaldi-snapshot-3.4.2049.2_p1-arm64.deb 65898224 BLAKE2B 63b75e0f9c8407837c536ee0f471e625e43cafe6c28d468653d65f2b48f8da0fb316031408e98cd4d5a3c8f4d6ba3217ec1e28291c5d049d196431a2eb014017 SHA512 b4022083a406655699c4414542099b7e057c08b09dbc30d62c92e0dbfa7e2bec5fbf0965140d9d81cf5d3715f581b4b0d15e91736340a821dc2cc580c5edf229
-DIST vivaldi-snapshot-3.4.2049.2_p1-armhf.deb 64892132 BLAKE2B a172cf9adf32abbd3193fca7fbabffec373d68318681038721b49ee3f91ce53c8623ec1f6c1c6cad8fbdb8cf4a9360089b597847d4d5540055e096beccf1ad7d SHA512 f4cc934349c6abbdab98b5feec593477257539069ff316df82f202a0ab6214abe8ba8a7efa6b3b02c22393ebb12367ddc38c6ced26f68c6abee0255745f68ec4
-DIST vivaldi-snapshot-3.4.2049.2_p1-i386.deb 70673824 BLAKE2B 2895ec5606727315ca67894b2a29e4ae1a747a09d47bc69da276ec026d9ab6c773d8abef66cca9d94632ebc7f3658c0086d76d9696359aef8e19a2bf35ba741f SHA512 ae5c7d2fee224a229266affc6dede97a033b387d5f796d933f5a37a0394e1c954d8a3a2dc4f2674abf69096af8023d7bad274bde5d91ecc17662e0656bfb74b2
-DIST vivaldi-snapshot-3.4.2056.19_p1-amd64.deb 73504020 BLAKE2B 6eac459befc2e0af859d1b47b906f9e070414c4b9035c9e0fd695a14d920491fcf33a7f15e285c3e6625909f173a4bd8acc098a8e420d0814d94686484ccd303 SHA512 72c717d25eed0e5ebf8d08704ac3e85da0842d94d1fcc9a77a8ac47d4ee8bdd6280bfd4242f789c152511978b075e13d8c4a6fe8ad870f7cff36de2aa4e327a1
-DIST vivaldi-snapshot-3.4.2056.19_p1-arm64.deb 65922752 BLAKE2B 8a6d813ef23ca4f8daf7c4e8d799ce4af59787c9017902b5497ef0bb0ba9d0668f5fc17af1eccde402ad53d7267d82d9feb94784e5ec79784d0513a7420ac639 SHA512 5180c8f0d5300577da4eff7867c5d41e5a6179a4a78fcec335913ae4b44ce2005b520d78796f280e3473edabfd95e521b6c34f2d972fa4c134e672c6c9f151ef
-DIST vivaldi-snapshot-3.4.2056.19_p1-armhf.deb 64889956 BLAKE2B 8a9d3efcf4f6ec700c361cf98561295a17b473fb437e631b1f7c2b8cec2e37bbdb3b733015a363bed21419105a0dafbb6b4b6b3ed15e2d7fe2ff92c4fd8b4d51 SHA512 cbbf57d916cb1cbd3de49405a19a20ffbe09579f0ddad4d1e27ca5fbee824b0240b10064893650217b6ef0f29d4d194875eb30c1fb12786dd006671ad7eeb378
-DIST vivaldi-snapshot-3.4.2056.19_p1-i386.deb 70724892 BLAKE2B 17313d53f72931462583784a4619ec39f875994b6340c40fbd9e6303bf3f36b771b05419496c0cafe98323508b20a0fa3aa579b9534b6d6b2ee780ab02d9f8e2 SHA512 050282659fc6392b815bc902b72a4058eed6de0081e8ca170ebfd1909723b4a693313a8099eb56198fa42eff727c29ba31b0d71328700a57fff8e7c412842a92
-DIST vivaldi-snapshot-3.4.2059.2_p1-amd64.deb 73541108 BLAKE2B e8b4117128fa4ffafdabce44d8c166b3a3a56e1ade1a885327f70d3108f3cb73bfa3d2bc7f00b424c40df688b2c672334919ed55ad4e7dc346e5c6e802ef968a SHA512 5d95a47f2bd91a7b026869441da7cc4db777fd564192171334aa4223446f7a48624572c2ed603ae4b60f3af3e3ba186f73aaf371a9301c83cea1639825a662e4
-DIST vivaldi-snapshot-3.4.2059.2_p1-arm64.deb 65939680 BLAKE2B 32c6da96cde3f73784ad4abda051dff839eb78c1e0eedc987259ed6a237b7dd1f95176c0b780fc98443265948c1a4b487c34f20e17b5858324b698bf2822d45d SHA512 86f599f834bb67dd710a11afe94e0b1fbb0543323e87db6a91abe8fae2e9babe3c9054f60c5963a3202f0f8fb599dc751eadb33b5ce57ee8dc5fd6c323217eef
-DIST vivaldi-snapshot-3.4.2059.2_p1-armhf.deb 64921572 BLAKE2B 80aef5d73b76cde268a2175d615836a27cfa80fe578d4a3bcf5889e3d8d2d3afc688a2bb6d97363562d82da34ed2e50cd62e9f6459db7df79a830a16932f85a1 SHA512 5fb552ca6e81a79425fc968922b3be76e9e2507752518cc6729083aaf83589ba6c119819730f011fd32c1afe76556011208bbae3918e0ef57a6e0580f7d038bc
-DIST vivaldi-snapshot-3.4.2059.2_p1-i386.deb 70700552 BLAKE2B bc7453e8488f3e98d84ea71560e3dece878e01338ecff5577443ddbb57b7f29116a2c2681038413be59cec6ab514086305b4c6e3538c3f68db57f5f7af4c3656 SHA512 f1f5b530e5c15b4bfac40156f29bc536c36099c1c8abf2c02efeab2a96ff91af578e4e058bd8ac89b1e4c5f2658ffcd92eeb4cfe415ba1916d42b87018e26b3d
-DIST vivaldi-snapshot-3.4.2064.6_p1-amd64.deb 73503100 BLAKE2B 770ec75afc7f69d4d84fa233c46d41521961b1731d93ffed8cbfd9613b6e62667f3ef1feb5babb842de0bd3dad32644fb9cd6a9a1580f4d6e2991f880020379e SHA512 effd9eb36f50acc9bc06069690707110ad1b2e48329177b7769bc3f6e17438a84ba6f9d4a97843fd3cae7bd06c66c57410ed7a9dec207387a61331c9ddb1ddd3
-DIST vivaldi-snapshot-3.4.2064.6_p1-arm64.deb 65889028 BLAKE2B e53e7826a14efdcfbebca48f71a98c1bf9d08cc9d4748b7cc3094c7a5f3d41cf4e7206272ba6d3978d5f1257165493cbe8b2cc01021e62f129a217c16f8589cc SHA512 5ba83030cdff8fc402d8dd02a77f6e03ef2113d1844ee6b71271d08c0b910d9e61bcc79688619908a5931159e78fb5e56aceb4e05f7f2c5e849f895c49bc703b
-DIST vivaldi-snapshot-3.4.2064.6_p1-armhf.deb 64878048 BLAKE2B 6546116ef81c8f1b8d3b91f0da6b94e5fa96226d3b2528711cfed32fab836faa286138090772ddc86fbc17bd3e9372fa95a88ee04566500abf56c84b510aaa81 SHA512 3ca42a8825a6f57ea7b585e86cfc4426108713525f4ccf6b065cd658a3f9c918aa927d7d826f8f36c98b43cdfcded52b304b47df9ff0e12114b13e80398e4fa8
-DIST vivaldi-snapshot-3.4.2064.6_p1-i386.deb 70652860 BLAKE2B 9a648b7510c06cb24cff8e490327503d63c14fafcf777600fa0d5dbeb2f72f0f68d505658642789fb9257c6ed5a5d2f72a507644264fe2c6eb9946bc9e64954d SHA512 ed2b0407a2f746c0b446f3b231e81942085e82c03bc2e274c83332c5c46f175e6d736f3a367ad8be405ce4becfd6978508ebe42cb256f56b6c8dc002f67e192c
 DIST vivaldi-snapshot-3.4.2066.37_p1-amd64.deb 73492652 BLAKE2B 18f9fd12f5007ead66fee3054414757759e3efeb3170523e90acf97001537bd693e73f21625a3f4b8d4f909ab8bce8283eaa7bb0e78fee6522d1608f2d0335f2 SHA512 dfbd9f1efc1992de8ec41a52037db26bc3ab2b84caf18c547955202aff8fdf329a6ad9cd760fc482c51e7c424f09830148f095d1aa0039ab06db56b2dc216755
 DIST vivaldi-snapshot-3.4.2066.37_p1-arm64.deb 65907828 BLAKE2B b5e4bab513741193b6e06364c77054fe412e5d023f307386d3dfdadbf1a88a55c2cf448882c176bc685b967ab91bfde126f276c9c8c0d146480a153c1f4d016c SHA512 973da5627c0b63aab59a93692c095b307ec4a3a992533b9468b8287b26c1da3dbed320978523f50b53ceea94153e7e2993ab2e92760f0e6856bc6b8b95bfdb4c
 DIST vivaldi-snapshot-3.4.2066.37_p1-armhf.deb 64869076 BLAKE2B e98116b85b697bc72266d40d4844b5c0ac9371e09f2a47114ca705297c6bb71ebe331ae300ecf9da78ac86168e82bfcfcf3aa63638c8e844602d353bc88f30f1 SHA512 d5e9b573e3087f073e4ebf3d0c6de84aee225725f88b3830de4189aa3960f694488a8a2c2b142bf81ef357b113d5abd83ca8f21ff486e0c51ea0fcbbee9b7bd8
 DIST vivaldi-snapshot-3.4.2066.37_p1-i386.deb 70671712 BLAKE2B 55ea6949a3083762c23a7d7a357ac95464d14d0166f7d6b8332d9d88027cdf90361ba657654403d3221ae57f371a0b812dd8ebc3dd1e11f3a42fb7d4eb24bed3 SHA512 46c8b5b78a8dd0ed88d45de67833e4195a9fb5a75abfbd2ca5659c7c4a137fa4d4a1b529e0ea7f4a035d9a9348d215fe28ab834126277ff0deaedce4013b2a3a
+DIST vivaldi-snapshot-3.4.2066.64_p1-amd64.deb 75588924 BLAKE2B 602ebab7b1122ce3c6cf5a0bf84762fe8cf25959c293ff1a2eb226c454653118c058ff89269d24dee53eb5d57e362f86b38e0cc557fe61ed5014de150d538263 SHA512 f4baa611b5f3fe0bfbdf625f2714511f8930ffd030a6c084df5af1876701ae066b16c52d02a312b7f1c51818e7cc122d622dae87aecee117a16ab6fd38612321
+DIST vivaldi-snapshot-3.4.2066.64_p1-arm64.deb 67995852 BLAKE2B 7334bc0293dce388bb7b7be6685fb8c6f0e0ce3e7a3818cc91180378c6418c937cd983f582aa8bf90b97ec8b64bdb35eef3e5062fd904e87e49ab92c11bbd50f SHA512 d447ad92d4bc3d5d9f66e6f5a35c77b1320cbf8b74a773ac2b9b96abdbc8900665e19833d33f94145123a74418cc3b6c6e61875fa67eb0e6c34b28c5b5a3d66e
+DIST vivaldi-snapshot-3.4.2066.64_p1-armhf.deb 66961692 BLAKE2B 41678db3443250e58df8e2c9c42b243eeac9f85e547054a777251a54afe58fa135aecb3737808f8a0df68f34cd55e8724ee77616588b673e97644f3f99f01996 SHA512 fa835c4c6f2fe4efd77118a9f1875f11ab75ae4c7ef4d461c767ea6cf35abed22f4c315b368fd68cc900506b52893c5163ec1332b0e9245bfa76da69e182fcc4
+DIST vivaldi-snapshot-3.4.2066.64_p1-i386.deb 72729872 BLAKE2B bb8ca9d86e61735593ba9883900b469715b31655baf8ae714ddfee8d385627c191405992b3e7883f12c180aa958e1a8ee0387ccc381f78505564c4ca0a77f539 SHA512 e0a49f1e3ac0c6ea4537a9f8bd6f4bbcd703e71543a483ab91418ce9a0dfdd622cbeaa81f5f3b6e8299e3d9b070ebf3208bc3e72d97228330d34fb97377e6a15
+DIST vivaldi-snapshot-3.4.2066.70_p1-amd64.deb 75591304 BLAKE2B 33d7f5120e98228dd29f1aa3ed722d4f2f191c8d6e41bd073867479ff54782b747d2659f9085cc19e81161e616364cae7ac20c15ded4ed1c29098edda37e6a3e SHA512 3c1ba6cbb94ff6da98a5ce602a340962e1427b53cf2068ded72434159d09fef67cdf98e55f46414169324c3f8635063c085dff790fa0ef41f7235a04d455f684
+DIST vivaldi-snapshot-3.4.2066.70_p1-arm64.deb 68012848 BLAKE2B df7926527388ad9646362b9ee026567f316b7541b255fe39e155454ee2ca1905938783069d8e5e16822693609ef227d625c99bf3dd4d926839bb5dc552954759 SHA512 f7569de9400b929b85a4450133d27a8b81bd3d33d5ae7f48c864caf97aa5db2c4040990d5467f7e7b68c9ee495629b216887315399d6e5443a600d34f071800c
+DIST vivaldi-snapshot-3.4.2066.70_p1-armhf.deb 66969164 BLAKE2B 44b28ddb82358d5d68329eea3500429bbe059bb0499639c261788387066809e8f3eb41a6efbdd9eac6a0a4ac083abd67cf48dee28ca6315174b0d6711f5eab2b SHA512 8dd70ef5f90e2a49b8e8db33809f295365466e59db4066bdfe2d7ad08a1144e4d03f8f5fa46f45838eaf5e0e69b05169cb69c4eb5ff9e1a1f61bb577ccd24301
+DIST vivaldi-snapshot-3.4.2066.70_p1-i386.deb 72746984 BLAKE2B dc9beec3a3277cfc33c2d4c8690de7a505e5add89190d228eb30d7952d3e671d0b1b8a161df861431edd76a55b61212341e1f0ae7218483a15c3552d30c2f304 SHA512 257a7bf5dd489deb7eb568d4a69be1bd9f53ef17b9f10e638d36710e38c3590744ba8acaf27570027b5f863ca175ea9dcacb72c9b6cd17ffd8db4fb58325e36b
 DIST vivaldi-snapshot-3.4.2066.7_p1-amd64.deb 73464860 BLAKE2B d1739427773ddc899de3db290e4790f6766048eddbaa50b39e529cfcb4cfd34ff458da0fb0f610f923d29cbcf5d08f50c6c682370482ad174a2b13dd73baab75 SHA512 2829da513d85d29965813281fd36ddca2793b6cbb6a107fe1e0058ba5ad7ef29141c3e327edc6b776c5ac30077236adeda0d1bc5e5b8a2edbfdc33ddeb6ba6a1
 DIST vivaldi-snapshot-3.4.2066.7_p1-arm64.deb 65925004 BLAKE2B 93da59c7829042f48893279c26278bc96fb4c55d66949f74439ad19f3eae9084c25373cc501087b180fdac9d958ed0840deb839d5c92374c221509dc232fbc74 SHA512 9736f058106e2c7db772eba109644044d6e2838880bc13da61892dfb4b2827efbb701cd4490d3ffe750684a9b19d3286fa791014eaa2b990ac83fcc5a946d79c
 DIST vivaldi-snapshot-3.4.2066.7_p1-armhf.deb 64924616 BLAKE2B 4efc6da89b75c97d9fd6f7f35808c2a39a208a94d3da573ed1bb0c5c81577349e4fde126d2e924d6a3df9c08515d2770e0cb80cb8f309851c21b28cb15dcc002 SHA512 ea8175e6e49049a4770d8c90da0b86695653b4d392adc6dd9cbaf2331ceb418d9faa65c9ce20d6605b5eb130e9d8bd89b39051d0360b4591a1c15c172dd25fd7
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2035.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2035.3_p1.ebuild
deleted file mode 100644
index db3613b057e7..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2035.3_p1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
-	fa fi fil fr fy gd 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_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.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 ~arm64 ~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/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${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/${PN} \
-		|| 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() {
-	rm -r usr/share/appdata || die
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-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-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2036.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2036.3_p1.ebuild
deleted file mode 100644
index db3613b057e7..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2036.3_p1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
-	fa fi fil fr fy gd 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_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.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 ~arm64 ~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/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${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/${PN} \
-		|| 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() {
-	rm -r usr/share/appdata || die
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-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-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2038.4_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2038.4_p1.ebuild
deleted file mode 100644
index db3613b057e7..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2038.4_p1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
-	fa fi fil fr fy gd 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_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.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 ~arm64 ~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/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
-
-	mv usr/share/doc/${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/${PN} \
-		|| 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() {
-	rm -r usr/share/appdata || die
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-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-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2049.2_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2066.64_p1.ebuild
similarity index 100%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2049.2_p1.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2066.64_p1.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2056.19_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2066.70_p1.ebuild
similarity index 100%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2056.19_p1.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2066.70_p1.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 852f045f698e..9a969e42accf 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,3 +2,11 @@ DIST vivaldi-3.3.2022.47_p1-amd64.deb 72566388 BLAKE2B a554a671a57927a6010534ea0
 DIST vivaldi-3.3.2022.47_p1-arm64.deb 65274916 BLAKE2B fc8bbf72484899741ff5383c9996204f21329679deb8a5712e98d0aa863998803023faf58d97382c10e9ca426e29c40295cb169f93621d783d5239f1d20ed144 SHA512 7cda781b9531e871070d211549f9cbabbb25c20bcdd208c2322032cefbe7f56d66f751a483fa0a68402db89d7ebf570099c9330d79c971353c8bc62592e0f839
 DIST vivaldi-3.3.2022.47_p1-armhf.deb 64311036 BLAKE2B 49ae9cf662bcbc438d0c082cadbcfca9fbaeda4da5418342133ada00d55ffc33cafbde1b71b469a00952ed9326daabfb766b96e4d1c78af7ef03364f9766d4dc SHA512 eb0ef5e061e32f8322ece7fd2169af19641a3f1a7f3d992d0cfc077eec48e848d74f5498d0f88b40eddf761ffb26e30bd0c38168858a9619a3648906cf7d1a8a
 DIST vivaldi-3.3.2022.47_p1-i386.deb 70821004 BLAKE2B 2a514e0242eddf2bb9abd1a25d9b5e9344be192de515601bd31c809c17a13240989a615a37e4c72b175d6b827b20147814cf9067989e2223669256619ace5077 SHA512 c3c681a9a0b56b859e62b22f155d81ca498ff4ff068e947a77430322e615a1e550b3fd8448b96dfe792ccc3703648fe9f0c241fdebb2fc57a6114f62354d19df
+DIST vivaldi-3.4.2066.65_p1-amd64.deb 75636980 BLAKE2B ef87a93a722f8dcd45bb4ff6a4cc8d3e13187da87112bb5dcc9e256ab01280d6b41b002cc6b8d5a5e8c37ee31a41dd89281b9f7ea6f519e16bb4d5f0a9f43d4b SHA512 66f1bf77efb6f988557c9c297a8d825a78000ff5c79b3ff33968820bfc3c74602c0d8a9b68e8e4fee38e6f53c803c77dacfa30cf9265dc99e728d34968ca9590
+DIST vivaldi-3.4.2066.65_p1-arm64.deb 68040944 BLAKE2B a7f80ba37142dab1884fb1df728fbfeafa184080a62792b1c5e1292184e867d04af427fce09aef20ae970a32a62a82f52cd6654dbb55f0b2d326dd92bdb7be25 SHA512 a36c5c9292ca297c7d090d9f1b6210b81f6863fe66e520f7e30144be3076e6c19087ec5dc75e652c1f8ff8821b6b1bb3df4e59a7bcb39251ea4a7fa82696988e
+DIST vivaldi-3.4.2066.65_p1-armhf.deb 66979820 BLAKE2B aa92cdc2c11aedc1b5012751aae9fb13e7a4bbbf8345434551c9f30ef44da340038da830cd3cc890b8cf2e61ca2dae75e981b69deaf23e72691163ebc4570e1e SHA512 b32e99b76a83a024618b7dade549c34f490f75b326501d3cff3d9a401981efc79c3ed09b1b961f9044e1747295b6b3ce4927453fef5e9eca810de0db93c86474
+DIST vivaldi-3.4.2066.65_p1-i386.deb 72754948 BLAKE2B 230f6ef36f04be2267439aef62602b90d87ce5a686b882e170d55f35611f247ce598ba1f1bb41a88c2681c84ec4db7b703b08ad0fde0c2bdb8f95071edd5e9bf SHA512 c24d65641cea61418ef511f78cc3cb5df5168597dc0ec807620fbb4d977800ceb26a05a5ed1e09dd2f048995c8f73f34fab3b0ccce3c3f9c0068387d32b761e9
+DIST vivaldi-3.4.2066.72_p1-amd64.deb 75636020 BLAKE2B 85aae8618ed3c98c2635aa63ab9ef64cd7bb5c90186b568eaa9adcd253d720d3781bf39f5c7b3fce02ea22d40f1b534a4f73e5b91f94cf22eb2bd12eb28634ce SHA512 0b394d692599568223daa633e59d7c83d06faa8af126411e9d3c9d5597b9d3a37b24a64446b063938427476d2097a5e784d3db937f7bee3725f5fb9ad307fc3c
+DIST vivaldi-3.4.2066.72_p1-arm64.deb 68014892 BLAKE2B feab09b2890310dd054bde2fbb0de55c8e503d1a5a0888badf052d00f702fa0ec714cc8ba696f214c8f23c1b2b100980230623e17d71b15ee168fdb475af009a SHA512 6aa52eaeeb44ea74bcfc48d3689144dc5cbd85184b957835acd5fc75d976343b74610a8440f98a57446ab331c6d6fa3b31ccfca6b68186ac77c281a3a1e580f4
+DIST vivaldi-3.4.2066.72_p1-armhf.deb 66998836 BLAKE2B 016eb684d4ba5a120231a2638764ebc4f5c360cb86d360ab36670365f29fc9c1924ad838763b7fc821b2e77be62d9059382ed8afe03928b7530c29038ae2acab SHA512 09ee26b1e48b2efc0ab26cdd85a77e3ed31ff4335ddbdb002afea37978d1d5e9c825438fde6c5221c77aa1556d013517293f5dbed304a8326e74778e9cc726b3
+DIST vivaldi-3.4.2066.72_p1-i386.deb 72731004 BLAKE2B 674c942d2db57c3add03c438baebf1fdb48a6c13bf3373078c54d27e787d8156209e90d2b1a603c9d375787978d762e32650e4a3df2c8e4ec751f2b15be5784f SHA512 08169ecc9ad7f3588e0cdced3c7de50a109776e8a11a8e2d247cee899a1d42d32bb613cef1912c0172593964355038278d7d034e810cf06dcc7cc7606927c32a
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2059.2_p1.ebuild b/www-client/vivaldi/vivaldi-3.4.2066.65_p1.ebuild
similarity index 73%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2059.2_p1.ebuild
rename to www-client/vivaldi/vivaldi-3.4.2066.65_p1.ebuild
index 0178e0245253..446810090bdd 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2059.2_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-3.4.2066.65_p1.ebuild
@@ -10,10 +10,14 @@ CHROMIUM_LANGS="
 "
 inherit chromium-2 multilib unpacker toolchain-funcs xdg
 
-VIVALDI_HOME="opt/${PN}"
+#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.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+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 )
 	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
@@ -65,17 +69,22 @@ src_unpack() {
 }
 
 src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+	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/${PN} usr/share/doc/${PF} || 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/${PN} \
+		etc/cron.daily/${VIVALDI_BIN} \
 		|| die
 	rmdir \
 		etc/cron.daily/ \
@@ -102,5 +111,5 @@ src_install() {
 	mv * "${D}" || die
 	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
 
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
 }
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2064.6_p1.ebuild b/www-client/vivaldi/vivaldi-3.4.2066.72_p1.ebuild
similarity index 73%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2064.6_p1.ebuild
rename to www-client/vivaldi/vivaldi-3.4.2066.72_p1.ebuild
index 0178e0245253..446810090bdd 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2064.6_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-3.4.2066.72_p1.ebuild
@@ -10,10 +10,14 @@ CHROMIUM_LANGS="
 "
 inherit chromium-2 multilib unpacker toolchain-funcs xdg
 
-VIVALDI_HOME="opt/${PN}"
+#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.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+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 )
 	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
@@ -65,17 +69,22 @@ src_unpack() {
 }
 
 src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
-	mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+	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/${PN} usr/share/doc/${PF} || 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/${PN} \
+		etc/cron.daily/${VIVALDI_BIN} \
 		|| die
 	rmdir \
 		etc/cron.daily/ \
@@ -102,5 +111,5 @@ src_install() {
 	mv * "${D}" || die
 	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
 
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
 }
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index ba7ca2af5630..5167e4285078 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 63b485b100f0..1bd219a57f96 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,4 +1,4 @@
-DIST adobe-flash-32.0.0.433-npapi.i386.tar.gz 8546752 BLAKE2B cd1426ebee07aa4bc81f54214e16481067458cbfc30ad6ecc1e64444692848ad66694f0d3969c8e7b57b6530a1f01ea5f0aaaa19d0b478d7d825e298dd00d27e SHA512 f972a03eeb421772f9da40fac39abe7659e19db9f087b6c66f4f550f7d0b7cc54be52b2d2d54777cbbb2cef4b170dbcf8a189baa7f14dedf0ca690c78d5f8587
-DIST adobe-flash-32.0.0.433-npapi.x86_64.tar.gz 9065643 BLAKE2B bff399e80686511b51fe3da1bff2cf9e7182f116d729da641aa3c82b888745ae7730a598ea572c7f0ebbb703fb79940359c9d3e256142b3a6c8d230c07a80b66 SHA512 536b23a664365ace908372a2dabe393cce4779ad76efe588ebbeafbd80e83cc96f4850033f9e1d530bfdf4c4330e9cfe5cd315a5547febc6ba9b5df97ddad03f
-DIST adobe-flash-32.0.0.433-ppapi.i386.tar.gz 8833417 BLAKE2B b02c3c34817eb63398a3ca92607abae5efe0c89382f69c67db7c0b70c59c0495cac93687320399b897642002df3bec4d670327948de9385423991f70ae216b9a SHA512 5111ec3e652748f6d1ef4a0419d33468e11b73b6ebf71c55b3f1396a98467e6e70224c485f83ef328601126171c60cf315c8d5a082dbaea1b67aaf0d7bd86744
-DIST adobe-flash-32.0.0.433-ppapi.x86_64.tar.gz 9764004 BLAKE2B ea25d9a1130b8a0929764e99ffeaf2fe02c51d1233370ef9044bd4c29b3d5267ca1f7c21f562ede6074b0746ead80d2e7ca000cb818f407402ede2921508f118 SHA512 106347f55d57ba63934b8c6cb91fa22b52e538e7e1776e57d31f58d31ef6972f42f08833ef9cd518eeabe7f2cdb71c4b4351ecb11bd3e2bdc9bcd11374e53b3e
+DIST adobe-flash-32.0.0.445-npapi.i386.tar.gz 8546864 BLAKE2B 10f585753cac9f23234a31aa816deac823c987cba5d8765295827c77df747785117f6d942796ebfcc25a7cee3717c000979d0aa3fc99c360704857e86d878f67 SHA512 986a259381b1055c18c5299b2082c374e7cbd0c0a0a3f8822f54f3c309d82fa64995156e0dad63b2456d312147d0c08ec9713bdeeb59b797d06b438a722ab2f3
+DIST adobe-flash-32.0.0.445-npapi.x86_64.tar.gz 9066116 BLAKE2B d83bd5bc5b41ebdafb64e16e23b3bc8857f72d85145639564a9bd12d82f1c72927a905911ed12fad0b882069e8bfe0cc496255d70e2a397ed7d286a0ec80a368 SHA512 0d1b0d533674c9c7b2ea4e089cf82645345732be5e255dcf1ea181587f48c3013b7956b88cfd2a24aebbf31540e316c13a87d8633546b9dc3243dc6e166657be
+DIST adobe-flash-32.0.0.445-ppapi.i386.tar.gz 8833013 BLAKE2B 63b38440d0c91d0e15c464945ed10004ebfb28d5cad7180e818641aa8c7e77dd3f5387027b3dbe494264c65e4520967af9ad0bfd73d954b1b4dfe95c2889f9e9 SHA512 78b45c4d9f9aba131927eee2a56f1cbc9128e5abd4273f07ff6102a31b6c032b9cfdd73a163f47a7ba5bbe02a2d84a81fcd0e43fff5d8602b3a237b330745c5e
+DIST adobe-flash-32.0.0.445-ppapi.x86_64.tar.gz 9764163 BLAKE2B 4f9d4053e5f6df78caebacb3d6d7198692cd1101f3504970e5105a56d8177ed1ea3697f57cfe5026df2a1d81b4406e90063dc4238c661311c1f28dbb2565bd93 SHA512 1d0522045b8ccba6a0b798f76e88a8dee7af6bd835901c3b49bac379706f070c683f24d0024609c2bab18ea22feca9d48802cde32c52621ad342cc4a2c33f210
diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.433.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.445.ebuild
similarity index 100%
rename from www-plugins/adobe-flash/adobe-flash-32.0.0.433.ebuild
rename to www-plugins/adobe-flash/adobe-flash-32.0.0.445.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index ac7b19f55b72..c5bd6e456cf1 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/nginx-unit/nginx-unit-1.18.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.18.0.ebuild
index ac0c6c8fc956..49c2f106174a 100644
--- a/www-servers/nginx-unit/nginx-unit-1.18.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 MY_USE="perl python ruby"
 MY_USE_PHP="php7-2 php7-3 php7-4"
 IUSE="${MY_USE} ${MY_USE_PHP} ssl"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index a786e0988804..914c8759c057 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index f5fea347dc57..68f79ecf8eec 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -2,3 +2,4 @@ DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f881
 DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
 DIST xlockmore-5.66ALPHA10.tar.xz 1943664 BLAKE2B 2beecacb2e1f041b7a239b083191812ae3480475b97d2d74718515e692b42cc356bd70bdae5ae85858dedb678e0f1c696d3d339d705097d66ea13f3e2948c270 SHA512 734c33c17f0698210ac4bfe36535f1cfeb87fa0e3ce5aa93f7aa22558da22b067e3c347524d7301751725a702cacb0e1517ccd88ccc1a43cf317552fe4bd1cf0
 DIST xlockmore-5.66ALPHA11.tar.xz 2080280 BLAKE2B c6e5df805429f62979355304c28389ebca837791ce6bf4a4bc9193135cf0c0f520a4776404c62a75afb57a30c187084f2b81d783ec93d5c0896b4d88edc9ef23 SHA512 c69d6414dc5dd708b5f5cd2bcab7405d7779eb8c6dbaaef07ccb9ba74be805d32c07184b19893d95567fde05aa7bfd66c626c10f2085867905f3632a5b4edb3f
+DIST xlockmore-5.66ALPHA12.tar.xz 2083320 BLAKE2B 271c3e67076086759e325315bebb63a509adde6ee93a9cdae7c1022649231a34a9d944a94676ecee5fb53b3105766095f3e9f4f17df60de14fee1e6742b729c2 SHA512 e495dac3ce0cb1983ee2757198babc05adbadf3cad90c576af8dc83f4c49a45cdc3411106df910ccdc9701b842d7ead96cb2f253ccad094464e900e9548f963a
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha12.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha12.ebuild
new file mode 100644
index 000000000000..2bb52c63b8ed
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha12.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( sys-libs/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+	"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/XLOCKLIBPATHS="-L/d' \
+		-e '/XMLOCKLIBPATHS="-L/d' \
+		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-cppflags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 2b4146fb76fd..eb5a1a9bc558 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,2 +1,3 @@
 DIST zim-0.73.1.tar.gz 2615382 BLAKE2B 055857b20dbdebc1e5d8d6b13c344fcf665d9889f392f9c58fd3cfef1f80865a78c48e5138d2443f67bb29b8cd915b8d0d6bc0ac4807de20344dfe6673f1350e SHA512 ba67b396a6c06921e5e67ab5ccf0559e54b29a719262411b24f178c350bd0ac7c8239f8d5d4396b9dc291aadc36b59869d81dc04d457ce4a36eade67cdd53dd2
 DIST zim-0.73.2.tar.gz 2611490 BLAKE2B 05fd020b3add3ac9c6fd860ca002a5c0755a1a1f1ee07c6e5027e16e3b8c64d9116971e96ed235b249b65b9097551b9fcdf46ed929a03a877c36a02a7d54e8fd SHA512 26c987906759436063f88863e90cf2643996913a2fae12ebc4ae623731ad97d488d37ad70e72153aba7aaac7fe2dff9bb6f9f06c4d899a0ac20e3bfbd20ff3db
+DIST zim-0.73.3.tar.gz 2648597 BLAKE2B c3709fc418317bfbd355f3715e5fceb346026393bfaec65ca8713fb2cd33243189dc3328b4be20b08452545704d4d1196f99f96df9445aaed5d0277b310d37f0 SHA512 880839495e3aa434267ac02abe2c1779c8cb3c9c7b73de91a19e962e7face2cd05399871789d719d89d0776d09fb9b339370f4fac8e4019be538e282accbe180
diff --git a/x11-misc/zim/zim-0.73.3.ebuild b/x11-misc/zim/zim-0.73.3.ebuild
new file mode 100644
index 000000000000..979b6c32c161
--- /dev/null
+++ b/x11-misc/zim/zim-0.73.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg-utils virtualx distutils-r1
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+	export XDG_RUNTIME_DIR=fakethis
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 0183b3dbe041..4f592555fda6 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/xpra/xpra-3.0.5-r1.ebuild b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
index 843bae636e49..0e40fc2e6e0b 100644
--- a/x11-wm/xpra/xpra-3.0.5-r1.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"