diff --git a/Manifest.files.gz b/Manifest.files.gz
index e70d4414d92f..57b21bd33a00 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index bc061aca98ee..812ff16a8dce 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/argon2/argon2-20190702.ebuild b/app-crypt/argon2/argon2-20190702.ebuild
index 335c2b502311..772e2743d6b9 100644
--- a/app-crypt/argon2/argon2-20190702.ebuild
+++ b/app-crypt/argon2/argon2-20190702.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 7ccdd48d8c8a..1b72e30529b7 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1 +1,2 @@
 DIST veracrypt-1.24_p7.tar.gz 25113248 BLAKE2B 8ead3325ce6fadf4ca8211ea45daaa82a655f29006f224235f44200839289d42fabe84da2e731fc6a169a7d157535c719b2cd9294524e68532c0065e41ed733c SHA512 d149736d4d6740a89bfce892f44757600c6411776b471a208a75b4573bbc6125535ef1b68c2f55903ff82f4d0fff13b8b07d3cf15c7a301c39158aefffc29e17
+DIST veracrypt-1.24_p8.tar.gz 25116825 BLAKE2B fccab3e7de7637f6f3a7f448a9dcc6671198ea6155e8f6741844c5bd844819c639f968e4cc6e13c274c90f2ba8e540a020b98cb12617a109d5911ce8dd9cb991 SHA512 16139d055e2b2dda6c38ecf156cf5d15cd4788253fe0c85e42050eafd8afbd5c5908e590e53a7b5220767ebbb3b9e81d0049a910b322e42f1c29d2c131bd29d0
diff --git a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
new file mode 100644
index 000000000000..3e0f7086fe38
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop eapi7-ver linux-info pax-utils toolchain-funcs wxwidgets
+
+MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)_MacOSX"
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, we don't have to worry about their licenses
+LICENSE="Apache-2.0 BSD truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0-gtk3"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src"
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	local DOCS=( Readme.txt )
+	local HTML_DOCS=( )
+
+	dobin Main/veracrypt
+	if use doc; then
+		DOCS+=( "${S}"/../doc/EFI-DCS )
+		docompress -x "/usr/share/doc/${PF}/EFI-DCS"
+		HTML_DOCS+=( "${S}"/../doc/html/. )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 6d48a5293e02..6a598b5b8524 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
new file mode 100644
index 000000000000..a913bfad1384
--- /dev/null
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r100.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools bash-completion-r1 linux-info lua-single perl-functions python-single-r1 xdg-utils
+
+MY_PV_1="$(ver_cut 1-2)"
+MY_PV_2="$(ver_cut 2)"
+[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
+HOMEPAGE="https://libguestfs.org/"
+SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/"${MY_PV_1}""
+
+KEYWORDS="~amd64"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Failures - doc
+
+# FIXME: selinux support is automagic
+COMMON_DEPEND="
+	sys-libs/ncurses:0=
+	sys-devel/gettext
+	>=app-misc/hivex-1.3.1
+	dev-libs/libpcre:3
+	app-arch/cpio
+	dev-lang/perl:=
+	virtual/cdrtools
+	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
+	sys-apps/fakeroot
+	sys-apps/file
+	libvirt? ( app-emulation/libvirt )
+	dev-libs/libxml2:2
+	>=sys-apps/fakechroot-2.8
+	>=app-admin/augeas-1.8.0
+	sys-fs/squashfs-tools:*
+	dev-libs/libconfig
+	sys-libs/readline:0=
+	>=sys-libs/db-4.6:*
+	app-arch/xz-utils
+	app-arch/lzma
+	app-crypt/gnupg
+	app-arch/unzip[natspec]
+	perl? (
+		virtual/perl-ExtUtils-MakeMaker
+		>=dev-perl/Sys-Virt-0.2.4
+		virtual/perl-Getopt-Long
+		virtual/perl-Data-Dumper
+		dev-perl/libintl-perl
+		>=app-misc/hivex-1.3.1[perl?]
+		dev-perl/String-ShellQuote
+	)
+	python? ( ${PYTHON_DEPS} )
+	fuse? ( sys-fs/fuse:= )
+	introspection? (
+		>=dev-libs/glib-2.26:2
+		>=dev-libs/gobject-introspection-1.30.0:=
+	)
+	selinux? (
+		sys-libs/libselinux
+		sys-libs/libsemanage
+	)
+	systemtap? ( dev-util/systemtap )
+	ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] )
+	erlang? ( dev-lang/erlang )
+	inspect-icons? (
+		media-libs/netpbm
+		media-gfx/icoutils
+	)
+	virtual/acl
+	sys-libs/libcap
+	lua? ( ${LUA_DEPS} )
+	>=dev-libs/yajl-2.0.4
+	gtk? (
+		sys-apps/dbus
+		x11-libs/gtk+:3
+	)
+	net-libs/libtirpc
+	sys-libs/libxcrypt
+	"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=dev-lang/ocaml-4.03[ocamlopt]
+	dev-ml/findlib[ocamlopt]
+	dev-ml/ocaml-gettext
+	>=dev-ml/ounit-2
+	doc? ( app-text/po4a )
+	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
+	test? ( introspection? ( dev-libs/gjs ) )
+	"
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/libguestfs-appliance
+	"
+# Upstream build scripts compile and install Lua bindings for the ABI version
+# obtained by running 'lua' on the build host
+BDEPEND="lua? ( ${LUA_DEPS} )"
+
+DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${MY_PV_1}/
+)
+
+pkg_setup() {
+		CONFIG_CHECK="~KVM ~VIRTIO"
+		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
+
+		use lua && lua-single_pkg_setup
+		use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	eautoreconf
+}
+
+src_configure() {
+	# Disable feature test for kvm for more reason
+	# i.e: not loaded module in __build__ time,
+	# build server not supported kvm, etc. ...
+	#
+	# In fact, this feature is virtio support and requires
+	# configured kernel.
+	export vmchannel_test=no
+
+	econf \
+		--with-bashcompletiondir="$(get_bashcompdir)" \
+		$(use_with libvirt) \
+		--disable-appliance \
+		--disable-daemon \
+		--with-extra="-gentoo" \
+		--with-readline \
+		--disable-php \
+		$(use_enable python) \
+		--without-java \
+		$(use_enable perl) \
+		$(use_enable fuse) \
+		$(use_enable ocaml) \
+		$(use_enable ruby) \
+		--disable-haskell \
+		--disable-golang \
+		$(use_enable introspection gobject) \
+		$(use_enable introspection) \
+		$(use_enable erlang) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap probes) \
+		$(use_enable lua) \
+		--with-gtk=$(usex gtk 3 no) \
+		$(usex doc '' PO4A=no)
+}
+
+src_install() {
+	strip-linguas -i po
+	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
+	find "${ED}" -name '*.la' -delete || die
+	use perl && perl_delete_localpod
+}
+
+pkg_postinst() {
+	if ! use gtk ; then
+		einfo "virt-p2v NOT installed"
+	fi
+	if ! use ocaml ; then
+		einfo "Ocaml based tools and bindings (sysprep, ...) NOT installed"
+	fi
+	if ! use perl ; then
+		einfo "Perl based tools NOT build"
+	fi
+}
diff --git a/app-emulation/libvirt/files/libvirt-6.10.0-Fix-segfault-when-parsing-mdev-types.patch b/app-emulation/libvirt/files/libvirt-6.10.0-Fix-segfault-when-parsing-mdev-types.patch
new file mode 100644
index 000000000000..207cc20ba091
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-6.10.0-Fix-segfault-when-parsing-mdev-types.patch
@@ -0,0 +1,61 @@
+From 4c4d0e2da07b5a035b26a0ff13ec27070f7c7b1a Mon Sep 17 00:00:00 2001
+Message-Id: <4c4d0e2da07b5a035b26a0ff13ec27070f7c7b1a.1607416232.git.mprivozn@redhat.com>
+From: Jonathon Jongsma <jjongsma@redhat.com>
+Date: Wed, 2 Dec 2020 11:52:39 -0600
+Subject: [PATCH] conf: Fix segfault when parsing mdev types
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit f1b0890 introduced a potential crash due to incorrect operator
+precedence when accessing an element from a pointer to an array.
+
+Backtrace below:
+
+  #0  virNodeDeviceGetMdevTypesCaps (sysfspath=0x7fff801661e0 "/sys/devices/pci0000:00/0000:00:02.0", mdev_types=0x7fff801c9b40, nmdev_types=0x7fff801c9b48) at ../src/conf/node_device_conf.c:2676
+  #1  0x00007ffff7caf53d in virNodeDeviceGetPCIDynamicCaps (sysfsPath=0x7fff801661e0 "/sys/devices/pci0000:00/0000:00:02.0", pci_dev=0x7fff801c9ac8) at ../src/conf/node_device_conf.c:2705
+  #2  0x00007ffff7cae38f in virNodeDeviceUpdateCaps (def=0x7fff80168a10) at ../src/conf/node_device_conf.c:2342
+  #3  0x00007ffff7cb11c0 in virNodeDeviceObjMatch (obj=0x7fff84002e50, flags=0) at ../src/conf/virnodedeviceobj.c:850
+  #4  0x00007ffff7cb153d in virNodeDeviceObjListExportCallback (payload=0x7fff84002e50, name=0x7fff801cbc20 "pci_0000_00_02_0", opaque=0x7fffe2ffc6a0) at ../src/conf/virnodedeviceobj.c:909
+  #5  0x00007ffff7b69146 in virHashForEach (table=0x7fff9814b700 = {...}, iter=0x7ffff7cb149e <virNodeDeviceObjListExportCallback>, opaque=0x7fffe2ffc6a0) at ../src/util/virhash.c:394
+  #6  0x00007ffff7cb1694 in virNodeDeviceObjListExport (conn=0x7fff98013170, devs=0x7fff98154430, devices=0x7fffe2ffc798, filter=0x7ffff7cf47a1 <virConnectListAllNodeDevicesCheckACL>, flags=0)
+          at ../src/conf/virnodedeviceobj.c:943
+  #7  0x00007fffe00694b2 in nodeConnectListAllNodeDevices (conn=0x7fff98013170, devices=0x7fffe2ffc798, flags=0) at ../src/node_device/node_device_driver.c:228
+  #8  0x00007ffff7e703aa in virConnectListAllNodeDevices (conn=0x7fff98013170, devices=0x7fffe2ffc798, flags=0) at ../src/libvirt-nodedev.c:130
+  #9  0x000055555557f796 in remoteDispatchConnectListAllNodeDevices (server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000, rerr=0x7fffe2ffc8a0, args=0x7fffd4008470, ret=0x7fffd40084e0)
+          at src/remote/remote_daemon_dispatch_stubs.h:1613
+  #10 0x000055555557f6f9 in remoteDispatchConnectListAllNodeDevicesHelper (server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000, rerr=0x7fffe2ffc8a0, args=0x7fffd4008470, ret=0x7fffd40084e0)
+          at src/remote/remote_daemon_dispatch_stubs.h:1591
+  #11 0x00007ffff7ce9542 in virNetServerProgramDispatchCall (prog=0x555555690c10, server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000) at ../src/rpc/virnetserverprogram.c:428
+  #12 0x00007ffff7ce90bd in virNetServerProgramDispatch (prog=0x555555690c10, server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000) at ../src/rpc/virnetserverprogram.c:302
+  #13 0x00007ffff7cf042b in virNetServerProcessMsg (srv=0x555555627080, client=0x5555556bf050, prog=0x555555690c10, msg=0x5555556c0000) at ../src/rpc/virnetserver.c:137
+  #14 0x00007ffff7cf04eb in virNetServerHandleJob (jobOpaque=0x5555556b66b0, opaque=0x555555627080) at ../src/rpc/virnetserver.c:154
+  #15 0x00007ffff7bd912f in virThreadPoolWorker (opaque=0x55555562bc70) at ../src/util/virthreadpool.c:163
+  #16 0x00007ffff7bd8645 in virThreadHelper (data=0x55555562bc90) at ../src/util/virthread.c:233
+  #17 0x00007ffff6d90432 in start_thread () at /lib64/libpthread.so.0
+  #18 0x00007ffff75c5913 in clone () at /lib64/libc.so.6
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/node_device_conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
+index 4e2837c1cd..cac4243b50 100644
+--- a/src/conf/node_device_conf.c
++++ b/src/conf/node_device_conf.c
+@@ -2673,7 +2673,7 @@ virNodeDeviceGetMdevTypesCaps(const char *sysfspath,
+ 
+     /* this could be a refresh, so clear out the old data */
+     for (i = 0; i < *nmdev_types; i++)
+-       virMediatedDeviceTypeFree(*mdev_types[i]);
++       virMediatedDeviceTypeFree((*mdev_types)[i]);
+     VIR_FREE(*mdev_types);
+     *nmdev_types = 0;
+ 
+-- 
+2.26.2
+
diff --git a/app-emulation/libvirt/libvirt-6.10.0-r1.ebuild b/app-emulation/libvirt/libvirt-6.10.0-r2.ebuild
similarity index 99%
rename from app-emulation/libvirt/libvirt-6.10.0-r1.ebuild
rename to app-emulation/libvirt/libvirt-6.10.0-r2.ebuild
index 2e38192ba187..0662672e8ae2 100644
--- a/app-emulation/libvirt/libvirt-6.10.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-6.10.0-r2.ebuild
@@ -126,6 +126,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
 	"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-6.10.0-Fix-segfault-when-parsing-mdev-types.patch
 )
 
 pkg_setup() {
diff --git a/app-emulation/lxd/lxd-4.0.4-r1.ebuild b/app-emulation/lxd/lxd-4.0.4-r1.ebuild
index e287cc4458a8..81f45b82b6a7 100644
--- a/app-emulation/lxd/lxd-4.0.4-r1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
 # Needs to include licenses for all bundled programs and libraries.
 LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="apparmor ipv6 nls verify-sig"
 
 DEPEND="app-arch/xz-utils
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index c4558a2adaed..e2a58965234a 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 48e56863f259..31dd23612f6d 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,24 +1,36 @@
 DIST amd64-debug-libreoffice-6.4.6.2-r2.tar.xz 1533877704 BLAKE2B d0f95c497e94216c934c4c460b19dd8716e8722152586bfdf1a4231cdbc16028de84cfa73ca71e09e94978d45224cdc59b3fd4b9bcc4849abeff1b2886e4bf71 SHA512 46b3048f55f0e47b979572f48381aff9b97f0dcf8267d93533664ea91a45c749f402aeecc9eb2a9390972aa15ba22944e198895f4c5b121b23a1f473e2ad797f
 DIST amd64-debug-libreoffice-6.4.7.2.tar.xz 1110428328 BLAKE2B ec71c99201c6884ab8b5d94b62c43ec965c3d254768cf86d3028296f164918f4ce47529f45b54bbad0245726f0a6caa9ec3fb38b66d9ed6687a08f512cd8fa63 SHA512 48a41248076d8be24cd5356e5ba0f25ac2fa69e4c0fa822e15b59f0ff6b28f63d8eb2a5d27d47e3021cc701b562b07d5c86e81dc115b291babd6d0912c3f9891
+DIST amd64-debug-libreoffice-6.4.7.2_p1.tar.xz 1110421236 BLAKE2B b7aad45577e4a9604d3cef7a8a6d90f50772075ca041aff14bac3d0cd60ef9c42c0dc0fe4bc93dc8f6fe40c8105ff4ca3711eb5d4f54535717f224cf620f3d3a SHA512 c832575c7d32117ba22da36db3bfef17587275e99dfe58be489f97495ec9d3cbaeed0640ba1a8d9621d8d1c95f0aeabeb7a62e2fbd486e3f5ce2737390aacc6f
 DIST amd64-debug-libreoffice-gnome-6.4.6.2-r2.xd3 1567465 BLAKE2B 7239068e9c32d58685dff3456d1c74d11092b0a5176ba5dbeba59a9bec54eee5584ee4ffb22266bc1e2854baf10057d60f73755a5e41df530b5f4cae69ff0597 SHA512 5c983a03a154a2ef3e48b65bdcd478f7f83345e9c3d4248811c0b2b98f2f4ed2d6fcb840a1862ee33911fa954371516649144e8e8e2c718f7ec1f6659ccf6b21
 DIST amd64-debug-libreoffice-gnome-6.4.7.2.xd3 1137139 BLAKE2B a4a9d56c93eddd1f67a189de9b71ca5a1f8a7623af689e43406d20bea9ae87a251000b67c098c4e53728cc8b6ea613119bce1ee8048f8435c6883be7ac9ab82d SHA512 b078e8bc899e5931acee912ac8a47cbe38700bee87c177928c58a7ee422d6b884054973d107a467f01801e9a02ce77a5203d01a50b9e0a41cc8e7724cd85ab37
+DIST amd64-debug-libreoffice-gnome-6.4.7.2_p1.xd3 1137103 BLAKE2B 94bb01a6eb22de43778590729e96f4b60eccb2531a08df9c3cafcdf69222b0a29eb64e79f14306b265532f3d0fa5e7b24bd19b93e9104d3497f5fc381916221f SHA512 8a28e2250bb8f057fff56481e739e0ffd36c1c2cd2f0ed70c018e640b5b5f7e3512bbbeec2fb2d9123e7cee53d02125c36e2bc2de7964ed0a2d94c306306da26
 DIST amd64-debug-libreoffice-gnome-java-6.4.6.2-r2.xd3 747959737 BLAKE2B 0151ef5d689d95a3444b78f8123023508951ad106a051530b8d91efd3fa4afc3f541d97e2e50afa483725d100fe9e3efbe234990ef161f7d1821977e9491a646 SHA512 d6e4e70e00c36b473fae6718bc2687c5af3a529e21fb98de348379203d7a1c0eccee6b168e7165bc4db302a58945256c45c1fed7424f681ca524ae58683f4770
 DIST amd64-debug-libreoffice-gnome-java-6.4.7.2.xd3 505924670 BLAKE2B 078d04deccaffa28d813961c26fbe71c94f8fa1d55a91d29a3bfc55612832e67b4ecec1c83e68a053dba52ad83b28bc855e6aa1c7ed69933d5fa62e844da81af SHA512 af3f99943c9e5025bb455ffd33aa948966053f56e74358d7be797a7b800daac12e0a1acabae2aa42303e396ed00156deaa78fa125d1a5d026923733219dab48f
+DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 505924630 BLAKE2B 4b56f6d58a9d6a4f856f5c4b95c8d6036ac16b7c19f8f68ae6f6fa8003937bb37e01541180c0d6bbb8f50b89b943153bf18a99d86bfc4c8e9d37539cf27194b8 SHA512 2f9352b0a2e336992444f513fd1eed5be90ad46077a9e734a2b777d7415edf256eec04ebffd77a178c8ecb0dbbae27ee6a03b93e7e8aa1f05dbbbc6ff4c8e869
 DIST amd64-debug-libreoffice-java-6.4.6.2-r2.xd3 746377573 BLAKE2B a2ee1b1f6b25e3f183948e9afb4a7ef07c7bfac003f64408c8de5607ffc61b0e4518c9b029e5732a98ad1d6840eeff4623e901825cc5a18bb95bd83bb8cc7944 SHA512 bfd37700646bb26fb8b59620edcff8152b85a97c323225899ceec0937326276eeb568be13c5264243ca79c486ee039da1476bba501957aa5885a2a2eb3ea0e20
 DIST amd64-debug-libreoffice-java-6.4.7.2.xd3 504794182 BLAKE2B d322b9bdec1f3e4c8284e568f65176e95586e815065422c67990675f1d90a59bc7ed00f3aae994d6c1eccf78d4382b99796ebb75c794c211f701c2d9dcb5df1f SHA512 59c4416602622fc299a2aba7daee16b7ceb497bb30af156ff202ba93cbdda6765d0d2b00935804e66047e86f45968a9456ec134babf723813417b1089380aa77
+DIST amd64-debug-libreoffice-java-6.4.7.2_p1.xd3 504793922 BLAKE2B f5b138b430af48e9efb61f7d203c09ab20ab73e035a817d4d8b542fd3fa50dff493954818ae89f572c43312c1ca8bbbd1020d1543892e1253b8243cae9dc2397 SHA512 f2fca65534a03af999e47d6a5d2f79a69a0bad9f577d561fe4ab0638d221a19f5ba8b0370c3f05c410a69d474e709902ad8565aa72b6feed69f09d0f0c6b7016
 DIST amd64-debug-libreoffice-kde-6.4.6.2-r2.xd3 461475494 BLAKE2B c59addb14cc79422b91c0a051cf06df4fdd33279fdaeeee512db76cb8fd6224e80b485d20320b209404d8d14f679053665f23218ce7b620d8da3b20c74c72671 SHA512 dea493fae319faf8cde12c192084548bfbf55b4017d2d3d96938f5705156a5b19e8204629fe98f205488a2ff6cfd29927cbe2fbfbd27eb37adbd6b2a8a477b5c
 DIST amd64-debug-libreoffice-kde-6.4.7.2.xd3 294248970 BLAKE2B 80c8677d59f18dc5e1eb5c069e87672a84c08a10b6c0e1aca5a040a7b1f272bb3f6335023eb372747fcf8945bc331a0c84779067e056d8969fdd2797c8a3e492 SHA512 508c65afd92ec61300dd2d791dfeec4553b83ae8f07c6150a29d59f0e53b51ba6fcd430cdc82500073dc761bf9fdceb5a9d42d245f78226d2fcdacd335baea3d
+DIST amd64-debug-libreoffice-kde-6.4.7.2_p1.xd3 294249182 BLAKE2B 177ebea55369432c3e3b28763d8ab8bce5b9e88cf6c6eeebb4844e8e6f36a1fcef95fe12d8972c19a1f8ecba28ec3c24117fbe007980635b4b6e9caf4ab054f8 SHA512 689023e9b69291f27edd9d1ff3844d56124e519a0d04c843a1222ae0760868b34748dcf310865d004876b91b167c4a1adf0494f6ef6b6be49bec1f691a278f10
 DIST amd64-debug-libreoffice-kde-java-6.4.6.2-r2.xd3 755546076 BLAKE2B 4d0c2bc849793a8483d3a3a7156812f30f9b97e1add1d2d2676cf69974db88e27cf073e0844e1e05cf337d6e109d134dc1d4c6b84c7c12aa3e36cdc6184b87b4 SHA512 dfddae1f600780d088c429e6951047960036e6f31e908cdb18cc552645230b00ed0e2f6ed6be46fef815d8ff49fccf5450bc3f23b9025c8720ed30eeb78f3a57
 DIST amd64-debug-libreoffice-kde-java-6.4.7.2.xd3 513057173 BLAKE2B 8839b0a989f528d36ae2655b0f53a8f7cd977a89a38301b32d382ff26f9ea48e84552ae654294865927d9969edc23c930d9488546bc637596325de8ecb4b4e7f SHA512 30bad549f117bbd69d845e71b4acbeffa160e055bf815e7e8fdbb4cf38de7b6550591bed014b879d4fc79ff307d4979de0d8e321ee5a2fd0dcd12c18fd33ac78
+DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 513057171 BLAKE2B a91c73bd6d4b4883a5ada8ea9198dee1e4c5d2693be36996b73b2c092ebc3b10805e320a14927e323709167392d6e5a0473b7081c6c799665b7939711c86f6ac SHA512 f90350bd5120e64ebf6c42e3aecb0006d302c35f2192cf0fa51a99a77abf7cf6a4f3d562d40598e9ca1839b9c181835640645963795b30a22fbf3071403afdeb
 DIST x86-debug-libreoffice-6.4.6.2-r2.tar.xz 1497855216 BLAKE2B 3c87f75f3f3c2201b20e08a8bae5162d5d4f7a5a3a315ccb185b4cc98d3f15b13a896757a01db56855b8f384a601bbe2b8802794d83fb964b6775e7164aad627 SHA512 645e9448f419a59e7d20d6450821d72e56005a94aabe51ff3407a7a910fc648d34ae6e790e77b1e236b4f00fc404707566a46825992e4985707d4b29616707d4
 DIST x86-debug-libreoffice-6.4.7.2.tar.xz 1499017160 BLAKE2B a8973d320bb7f84a7153b3f2fb8de9223a4f379a9f235b11932884413830c4a1e7102255330aff2dee4e9e86ee8f613558001e2d500f3a5202bd9152154358ce SHA512 9f6b4c7da5af45500ad32a8c034b207dc498b19fc043c97d090d097a511f1fccdf3ecda23c3aed8b62d656d62a3030c0384c60a304e5182dbe4a8f8f63bba798
+DIST x86-debug-libreoffice-6.4.7.2_p1.tar.xz 1108972372 BLAKE2B 509f6482e83bdd5539e9f1affab16489ce473168251e73b260bee5be72e12de1fef1f66ec4d2c6f7e72999cf25ec515a47e6050387d3ca474c62440d75630d75 SHA512 cf8aea2a8c8c52d1d42d2a4771ceaeb0641242aa21316b47a02f9c34d4d76f96a3602102bcd8a458e7a0591848a2059a3dd4fcefb34f6cc6fda411225938c535
 DIST x86-debug-libreoffice-gnome-6.4.6.2-r2.xd3 1521667 BLAKE2B de0026bb04bc48122cf7dd1a2bda45cf3a744a32a665e7f8a4659a16771ffdcd1e86103633c390c9ae03bec59db89b3b38cdec420d1a214b15948e3c06cfb416 SHA512 b9af148a94e9cc988667bc6015b6b11342dfcefde30a085cfae0269e4528c6714291ddadcd8373320784fb12698504247e5d3959690613d024e422c04709410b
 DIST x86-debug-libreoffice-gnome-6.4.7.2.xd3 1522241 BLAKE2B efdee90ec7dd8dd0f13855a05917c3bdcb39c27539fa967ac1f0ed4a498771386ddd74ea9d473bd66961277d410f5af055d37925ecb32d102bd7d242efddbad8 SHA512 77e8f5d07fa659ac0dfb99ba0eb8c5b3c103d517d7369ee451134a3d752998c63f7476583553eef0752de1eff352851916f2e6a3c0d9329c05faff18fb893605
+DIST x86-debug-libreoffice-gnome-6.4.7.2_p1.xd3 1133117 BLAKE2B b45195154069fb8216967f0093ea59f6ecf1f872d636f4afcac58f500e2281275b7262176666f88d6599dd9b41072cde083ed6f6b7f939b8c1f3d3167b233f79 SHA512 31eccf49c4ab11fd3ac6ef354802e72122042efdc683ddbd3b48f25fed1ee87c1be9f9d222c1da8ee3066c2ce9b090d91d27ef3af57a84a2f275d7e5d01922ae
 DIST x86-debug-libreoffice-gnome-java-6.4.6.2-r2.xd3 722465261 BLAKE2B 682e741bb10fb54fc50cf04530af5c3e3049f5bd1b4c5667bc9f24f85552aac47f5d6825d5d1412b8557cdf0a33612b45f5d3868b74f60586c593443253f02db SHA512 e4fe34f140aa6aea94cb7e7def6463d88f6c3ddded4af19627cee84645aa72a2f810d0474364faa3409b5e7f1a8a1394dbd3728d747b8b46e4e9d26dc902006e
 DIST x86-debug-libreoffice-gnome-java-6.4.7.2.xd3 716893739 BLAKE2B 737883b6dc02841467a9d9fb1ff3602652fbad0c78b5bb6910b969ca826649f08c86d557eb7389bdb3eb397a3b237b5ae54af07b4629a19b25b5847923c93f97 SHA512 137d32f4ce10790d8438bc31e689cf532c8077d2362dca402f09611454f8922773b8ee6745f01513575e36466ce13ddafafdd5699334d360fd6983c999c29f27
+DIST x86-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 505451908 BLAKE2B f313c0eabb4ff2fc812db2fc0ed08a85e34c081bf8616c52d231db5a35a30907ecd3d1facf4dfcbbcde84db850d7914476acb8bdadb5398fe6d1800823e21681 SHA512 47f73b23276b7a8f4a6d29cb415d60f9ccb1ac66cc403bec371dd89de659e62e8158665bed69365aa3c4471ff5e28f30db15e6b17f7331c20e929ef6c538480d
 DIST x86-debug-libreoffice-java-6.4.6.2-r2.xd3 720927677 BLAKE2B 2427221039c273774fbab8f2a697366163afb69c2699b80354cea559d82e9e28805da0c248e3e851e64792af47763700783deda6b8088e5a230e06a49038a60c SHA512 fb7e2ee5164d143ddfc7c1a45e0b61047810f4f20149705bc6a4e58babec35200803de970062ce8bebe9971a476f99a82cecc2a643cdc7dc2cc86b76905fb4c0
 DIST x86-debug-libreoffice-java-6.4.7.2.xd3 715384916 BLAKE2B fe72391632dfef10f23b01e57eb7e53c9cbefc0cfe3bc24a1e7ae2dbbcd43680ed23d8bf5da4d665463c040012bd2527b401f2041160d5377c021f7177dd1cf0 SHA512 1e698539379ec4da18daede4b964271de19f0910e7a7490be95fd8b0676f94bba949df05cc171d0d99dcf6225bfcb0d9781b61b90139cc3d5b016bc2285038ad
+DIST x86-debug-libreoffice-java-6.4.7.2_p1.xd3 504312380 BLAKE2B de2fb9ba9dca1b76cb4c92b5a24540598b0e01d6cc94cf2d483190e5acf6dd6024868fcb50085ec55bd4d03a552a07dad886505a0e63678066883c7fcdf852ca SHA512 dce66dd9c5f7f3cd601dc148e838887c90bfb48a599a7051701086a1f1794fb8a5dd4d0eab3ae7ebfe48b7c99c48732a0086e16496174688370afdcf27a49cfa
 DIST x86-debug-libreoffice-kde-6.4.6.2-r2.xd3 442030408 BLAKE2B 414eb20169ea42e4b4ff73a502987433911fe1332e9ce26e1618791d74dd31f2f0c9b2ae27cab427ed8f959aef546eb2e63041c7c890937e0ffdc0fee650f27f SHA512 8d857d3567b50a109f13b120f2ffd6089193d78cb63c480985a3d0cc8068ff08bc7bcdd8b9255a53a808715085cda1f19d8c0b32910556106967533e92f7a974
 DIST x86-debug-libreoffice-kde-6.4.7.2.xd3 439198379 BLAKE2B 0d7e40e97fe44fbb4ee4d55b9c2900e9a5bd04c128e602db6d47df7127b2f9aaa0c6745556688347138d6c56282971b190e2a711e78beebd42a1bf27c164cb9f SHA512 73f51c55d67111e1e9e70a12dfc44c864d00c62c03bf20276a9d4a5df6725ed93dc38f75f7fa9b40908aa438de5f9bf5e2ee6a50a7cf58f7b5d237f87f55d38f
+DIST x86-debug-libreoffice-kde-6.4.7.2_p1.xd3 285518032 BLAKE2B a213129359e4d5912dd514c4d00d879fdd5635f2a6237bba9771f064811a1f48bc3d0be706a3a2237ca7a48df6f1e1aae1cc0b790ac3e5c02310ace18b4fc141 SHA512 93a0475bb64849414fbf72199f6c2cffe2e67dbb64d89d8edec77af881cbdc6eb55d53362052296846619911be4f8d3e2f1d0a1b94e1eda0977d12b68e460d6e
 DIST x86-debug-libreoffice-kde-java-6.4.6.2-r2.xd3 720717402 BLAKE2B fd9c28894f274dc1be028085c3382040e4f36a49262e79d623f4c818e7c8b9dd2bf25b65f8d49914f02b93d3e61ea8758129a7f57850d559ce437d94f48dbfbc SHA512 a1e0622d6a4ff0dc05b835569c03626adee6114e8d0b25dc3739d90e0d951976df8527751c57ab65d2e79991086fc304266939f0d0d0f959a3ed5016166678f9
 DIST x86-debug-libreoffice-kde-java-6.4.7.2.xd3 715354739 BLAKE2B 063c8ac1805dc740b3d2fc58fa748ed2c70e6d41a11be81616831b9c9aa182828acdf2b6e2f6678b56e93fd797d72de352c07618c28431904b57d11316208fb4 SHA512 eff46bc156122134cc0e2e8bb14ae8170c54ba99213e9a0d950ed06a5345986803978e6dc01edd06ed08a21b5964754f66f73f3ec60ddd0804260c15504eb03e
+DIST x86-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 504334898 BLAKE2B 20ef380020b1688b769f5d01f440cee328ba5b94e4ccd60ec6616e45d409d2e4d966ddf37d9ec1e5093cfde48874f4f866a728efa0c0015252739d4979082c2e SHA512 75498a9104e66b4acf95d765cf1c97ff61dac26c4b64e743b02cae94d4de87e3daa8971b1a069de1ba300af6bf51e2146ed0c2d118dc8cef17810b4cce031e93
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p1.ebuild
new file mode 100644
index 000000000000..6e24ae1fb030
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="~app-office/${PN/-debug}-${PV}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index fc0ac1259e14..ebbc14a4f8f2 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,24 +1,36 @@
 DIST amd64-bin-libreoffice-6.4.6.2-r2.tar.xz 131250704 BLAKE2B 3cb2126b88658cddbc42e982c2d25dc3592955c594aa60f731b8082f4173e9cd96f6663c64fbb345ad7b1b99a7981c2364c7382397ccf3ad9be25e176bf4fd1e SHA512 f40b66f6261a35a421817b4d686cedf3361823e0284bf3a40255c9cde85620ef20c5d8fae88ff60c16bfef0cb96b9e8a1bc55c510a132fdeee54b9587ca6b37c
 DIST amd64-bin-libreoffice-6.4.7.2.tar.xz 132948096 BLAKE2B fda656550b7ccfdd1fd82b2e67c677b781fa6c27a462af45c19431bd4133fd321980bdc80e3b42e3f5f901cb1b3cf079ac8963e688de5e2d35391351de0cd7f1 SHA512 0a79a04e0edb084e69d51e24dbd6be871a007897795696bec70c2f006f2e8c69ded05f630d4a5e67868d1b3d3a31701caf29a112e6bc350a036a35bef2fb8cec
+DIST amd64-bin-libreoffice-6.4.7.2_p1.tar.xz 132939056 BLAKE2B bf289afca20492f6fe099ad180d33a730e90ccba60c133fa9ddd034d6751b86ef5f68b630ac1e67738d67d94bb79d39946df52cdd49b38fce401d33521926db4 SHA512 5138d6caf05817f658377b938927053fde3b98a8496cca9555202e862dabef75f35cbcd91c6a570611e2b908e150f6f38b3b775b9af9048cbe0ac31d7b912182
 DIST amd64-bin-libreoffice-gnome-6.4.6.2-r2.xd3 1886188 BLAKE2B 4f0cf34b16b1a9c753deee20200670017395a092134683f43d67a5dad3896cc0be72e3ca7ac099af33a0d81fc82e723bd9139285cfe1a0019a872c54103f6b68 SHA512 510000f14073c21dba8a134f7ee5b3889e83aef19abd4443d2ff5ab624ea80f2e220950cd00b0b9b305e857fb875b81758b3d64fa94474392ad87ccac0cb5bf9
 DIST amd64-bin-libreoffice-gnome-6.4.7.2.xd3 1921581 BLAKE2B e54f374a7e595c084314c4123f64aade83da89ceccd7d00467d52de7b4a3e7fbdedfe6f9814c6077337dcc24cd2050fc56cda4ce1b0cb3d31f3534dbffd83b00 SHA512 be83e2511eff1fb5d508c3915fe07de8eb171b962cc22715748b1dcfe90c91deb0981856008f7aad84e1a7c11bf283b53ae57c703af98370e3aa120195e468be
+DIST amd64-bin-libreoffice-gnome-6.4.7.2_p1.xd3 1921163 BLAKE2B 15da9d0e63cc85026ab7a3a9a98dfef7a0971722d2a663d54e6c1f9af069f007b3cbdca8b4730007b70d2ce5b6594732f2672578a3739e5be8f1f37d41fa8d51 SHA512 b0e1039cb094eee47e7e146c60e17f1ae0e2c49400a66741c8f9a4f34c32129028b4387a03881a28fdce6c9e56ca71ce0c28d07972821a22a78901670112bca0
 DIST amd64-bin-libreoffice-gnome-java-6.4.6.2-r2.xd3 28380619 BLAKE2B d844e396cb4da470ab27c7c566cae91c559d2502f5bf4e0c5796806f6ab860b1e92757e39fe61922c43a34a26b01828fe4d8a59bb4f70d7bdbef0cbf4d0dc276 SHA512 5f7bdc21dbfe17afdeb0460fc7df1d38b411bcc46ea1dbb749c2255d65a9b94d0cd49b1cb3af14cb4b0f89d9ed58a36d857d15a0415e256b9320f0304a379920
 DIST amd64-bin-libreoffice-gnome-java-6.4.7.2.xd3 29310262 BLAKE2B 7522d4e5822118eea25dd0a576f9897067efd0f753b02714d83781865a5621a6b9afadec0486d5fc78ca7820fffaa5f97b48a9705394b60d844a74ebba1f54a9 SHA512 7afcf6e0028b270731d1fc7e7f43f78bfb4f335b3bf5c3e23c4e84999b8acc824787260bcf1e35d36a1e4ba9b53b7300e921594978ef2027697bf879455e8572
+DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 29288984 BLAKE2B c1379fd0ef1899244a513b1f53bba861d41bfd5eae26518fe6931bd805e9b2a8ac5be79710415b4f539d48e38fd964f198f3401f29c073c14d1af0f57ca8e51e SHA512 69bd379194cbf6c376738408a1979f4822b52d2012d1442c32b4320ce410768e69dcaf323527936aa3a9f183c4a846da95f00d8379dffaff055130d2ede4ba8b
 DIST amd64-bin-libreoffice-java-6.4.6.2-r2.xd3 28215336 BLAKE2B a6524b72e6d27620e939d1ec7bfd57edc0bf5ed63152e80f3eba4eea8bf18e95eeedbf850e615a8c5f365808b6b83fb538a6679e3950bbc382818d89e2b70c69 SHA512 022da7edea982c03dd9ac96d6fb8719bda51d750722146ce857e781e6e4fe3f7bdddbc8e14cd7cf22edad84a9e955ad903107eb097e7642025e42d6d9056974e
 DIST amd64-bin-libreoffice-java-6.4.7.2.xd3 29174864 BLAKE2B a285aa34206fd7bc419359a065d220904e8bb1c8e90960226909574ee6825d46198519156d0e864a06fd921a67d6ceebab57bf6da17c6df8c5277aac977d3a94 SHA512 0c71c4934b1f1405e506d29281dd5272cc1e4229c7766cbad4f88e0340ce585d81714e72acd53805b5cf84b21d79e51b96944b56b6793bb66b53db4372b7c8bf
+DIST amd64-bin-libreoffice-java-6.4.7.2_p1.xd3 29140522 BLAKE2B 957fe72caa6c1f8b156d217b8d66b45275bd44b08769ebbc4d1d2cc9e1d4b3918a4c720bc873b9ba181203496a5fa66defb596b3f1ab1d0a7cef07cfbc1f21f9 SHA512 6bc23b125754e0da7c27101e650adf3a0660088306c2dd70ffa6cb403873e1ae0cfdbe4384913575ee4698be9f52ad77d845c8c11bf7a040f09c409da944d28d
 DIST amd64-bin-libreoffice-kde-6.4.6.2-r2.xd3 18424710 BLAKE2B 6153f778a10cc51564a2718de27bd9cea4c55f22bed3f27564079cd8887ae99cec1ab3ca20c859a054ba2531464883a40602447daf348058570f2cff44595f1a SHA512 2b67b2b4a4f1eff704bf6e807b24b82ca8ef51c63a480395256c3bcd89667b860ca9b5d7261c3df5950f75cda67a5c3621947596e826882efb173ccac238a673
 DIST amd64-bin-libreoffice-kde-6.4.7.2.xd3 19698130 BLAKE2B a68cb8c988bb6dbfc29534718337553a9b006305387b49987252b9c3bca8acce0606d675f8d18becac3ae192779bc4bc06b84bcdd3cdb467ddc185e2a1ef4e2a SHA512 b6847ce9bbb62a706af825c6a6ee96222ae8cc01df7580f45bcf8e4d5acf004ce08c8b247f1c0dc67f8fe0c998f443a9dc8840a6937b9ff3aaa73fa96717eb14
+DIST amd64-bin-libreoffice-kde-6.4.7.2_p1.xd3 19705370 BLAKE2B 8548d25cda6812f20e2a7f8b9a7e0a87a92de4755f7883edd2291cc7b042f316ab43c0825cdcd6b2ad87cf86f715a5d12a63ca81de57feb383ee51410e71bd9b SHA512 1967b746f68e764e3f2499d4f8b23ecfc3c53cc07ab8b17c40b311dc5211b4624218db257058772bebe2455e9ac2dbc243764e9e142663a5fe6dff944a91aa6a
 DIST amd64-bin-libreoffice-kde-java-6.4.6.2-r2.xd3 28690924 BLAKE2B 2bf8712408e5c993a4c346dc86be3c4ebcf4a24c791ddcfdcf26fa526d4a58404bbd42d2476520fe809b61cafdacaf0591cc598d3730e21e0a4c4a001b3fd0a8 SHA512 db31c45d802664a83dc27fb73b207b38fc465cd563524f4f31be5bdf1cee213219243525d316ccf203b02afb4e7ed562cb5ab9d54ca7e2426f0554280814846f
 DIST amd64-bin-libreoffice-kde-java-6.4.7.2.xd3 29844043 BLAKE2B 7947f9e71cf5b54e558417b9ac7788e8185d79cd3b7ad3d4a7318e0c74e105b72fe634358b718c46baacdcf003a2308d11ef36cc800060651a158d7d8c22852f SHA512 18de2a7dee8db9138dfae2f19375a6b3566410711d9cbd7a90b06430efd5e98fe8bf94afc6adfc5a4e4740cdcab2ab0bf5fd357ef67e24ad5c6c432aea552021
+DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 29774822 BLAKE2B ae1ee0dcd887eecd425a723827ee831e143369f4d0b4674d0c88ca8a00b1b976940b1d9d6fa56b11beae80955ffb9c6177a823f2aa187f86c7ecb96729500730 SHA512 c31abcdb7402f602e3b912831ebaa7ba41350399866b0955d5852e7c946efc676be8dcee1614478ff4217ce090a3947ea2cc1fe266bfb5c29f462bc5f264e98b
 DIST x86-bin-libreoffice-6.4.6.2-r2.tar.xz 133202572 BLAKE2B 235a1457025f70c16c2f71e80ae784df8d1d8555b8b47ff3028ad0841598199592e371e71d7f99504806ceba9d59387ec11fbcfdd871466f614d3257522dba8e SHA512 e82c10d2dff99b5572cf80ec53a36ead86b5d0291a734fac6523d3c9da5bba1f3c266f81405a5c205015ed54fc9e60520b05324526c8745fee1393ef7340698d
 DIST x86-bin-libreoffice-6.4.7.2.tar.xz 133266796 BLAKE2B 0d3ca2ce2616229dc0fb7f066c6f0fec731c65e105957624d6dd899c9fd99c7d6564864b94e0ec87190f65403d05bdda35adc7671867e7bb5bbe960d397e2c42 SHA512 c15af12f8884658d7f348fa38e7569a8fcf5a3dca3107214d2f65b44ae3206ad2d59fe3f5e5c9ec2874401acf5bf5a1b21175285abb845629151a86706861a10
+DIST x86-bin-libreoffice-6.4.7.2_p1.tar.xz 134606628 BLAKE2B b6bba84073dc16b473947b7bf2f103f2e66226e172e66f612a396d1b206253229eac4320766f0977e8f531290e8365d7c491a6a4ced066f57ada553549741bce SHA512 dbab1dcbb39909b88d77351314441d096ec59d69c383c9a8bcbb82801477e14f0674932e0215ea1945630f328da8de8875b8e240c7e5c8494e57de233a030f0b
 DIST x86-bin-libreoffice-gnome-6.4.6.2-r2.xd3 1905204 BLAKE2B 4976906069cbbd1a2f32269f9517afb627d59603301a99996bdea5a827bbfcaa602f14134f0d3b7f660b5778547322fb33e5183d410d4bb813220fcebca4f13c SHA512 ae21a2ac49ded6b583ad0854ae20ddddf5fde9ebb17fbd1bc687b44b2c764ddbf08ddd199812d1bcb06bed5b41aa928c8faa9549418549f439b30c6544072643
 DIST x86-bin-libreoffice-gnome-6.4.7.2.xd3 1899092 BLAKE2B 380eebb04c3f4369f7f89267f79c8bee2970c8b3089ceec7d684ccb2e1d790ec5fa59ed04654144a0c940fbec68931c536c133031fddd0ab57f503c954a27b99 SHA512 8b33ee8fdc6d5392bf696fb747db2669963b6894cf643ace0285dd2135fad2de3f67fef0948c654b43157f4e3d762aeba3c4af44e55b2714c20d569d6e239a1a
+DIST x86-bin-libreoffice-gnome-6.4.7.2_p1.xd3 1918270 BLAKE2B 3ac058041b731c79e45920a88c6258408acb6b3fdb664da0cd17d0747a1656b1df61c4ab7929c00755fb2b9f62e2f79789a1d915e5f93806435b96ecde072b26 SHA512 7a9ae3883f3abbdd80a63a52d12fe263540686c1a33203693c2ec1d729677017776f3cb9fc391d0796743bedd8315b203603eaeee4a35948d105f5c2265cd24f
 DIST x86-bin-libreoffice-gnome-java-6.4.6.2-r2.xd3 25844744 BLAKE2B 143403983b1c918f3ff82ad934aefb60a2deae830407659f0d72bbebe87a31f13002ebd8ab879ae5469dde5b966f91e9081c716fb82c838182174759e1368bac SHA512 ce8646f82049f38f044fd5c7a330501dddab07e48df9e82bf0114bffd27ca7d9d82c3e55863c57017e7c1aac2d33d8824179646d19fe6afdd3767e225775cb6d
 DIST x86-bin-libreoffice-gnome-java-6.4.7.2.xd3 25614604 BLAKE2B 8c928716bdd197247f1c1d6c683497db7a8137ee3d106207c61fdc1aeec537ecdcf1ff1e6f14f7ada5c7ab4664109a12e98402804e59a3099c1a980a365d628f SHA512 aa0557a66f8cea5e4b2bdef62d57838d91298a5250789973c0b4333d4c0d6757cae74b41673cc2531d188fda0183425fb1a9e5ba2f8b058b540e4e7404f3af97
+DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 27287304 BLAKE2B 8631b35146ed208577dbb621ddd947e3bded055419c34fc20fde02d942bf5b09ab614849ef8ce3fb8374f2761eeda074af6504c122e7072ce93256b603acb57b SHA512 794ad30ce84e4fb2b57fe4de985cd5dbd035317eac1e3a3951b0012204feb581134e57cccf7d113f9129f0a4891cdd65a5c419c35bce866d29dcc37e84abc87e
 DIST x86-bin-libreoffice-java-6.4.6.2-r2.xd3 25972754 BLAKE2B ce1a7f4557972754f6ba3857bdc0244ab507d984486497a3c6715162db6aeadf58cbe3061a078d91fa8fcc19d8ee266d4650d01ee585c34eef1fb264132230a8 SHA512 52472ae87d0a9af4d9e68591188baf008eaa195ae73a7312b4ee4253a41bbae93aa14236a9042a6019d13d42de347e95a96170eb1f427c145e20f7e278894749
 DIST x86-bin-libreoffice-java-6.4.7.2.xd3 25662372 BLAKE2B cc0725db91009a123a56df9c855cda0c9076f0abcc7feffde64532e7760a57c628826f0aa241d61d4632a207fffceab96eb62c37809bc19da5a05ea60ec1882e SHA512 af0b3e67fb657894c64591be8cf31eddaea7e68540c638b0e6c266c35c550db57269c9618a2a86d1ac2d28520f09b24ddf345c8cfa41cff5bfdf9f7f7bed6283
+DIST x86-bin-libreoffice-java-6.4.7.2_p1.xd3 27166653 BLAKE2B 2773a3776d63c87a4fefabbee8336f759c86b08cce6c035da3da88f18a6a5ee3d64ed56e26fe1fc7321aaacce9f1f2df07005765fbf9a5eabdd33df000aff1f5 SHA512 2042f578bfc5610a7d07e754f6eec56a1fc654f254e4a75295171c8ea032b629994ca07b4fa9c4cb96f440677f3bf59a4816de38d1e3eca7dca81a4543cea84c
 DIST x86-bin-libreoffice-kde-6.4.6.2-r2.xd3 16601007 BLAKE2B 8006626e82d0423449b0407e32ecb6a345cae46cd4006d545bcb4727873c90a1984c3d811c2b3e83bde7d5b02ea5b81390e7b782473f12564efb536c57d40ba4 SHA512 e6cff3950450bd6d4a026321a69898c29eea4eeb66b34022dddc2447780712fc221e17b8fe2f267d506d4db7c63133bc2bbca78fb3e769a451337abd354d926d
 DIST x86-bin-libreoffice-kde-6.4.7.2.xd3 16373424 BLAKE2B 18a65bfdb75230eeaf543765b33f4a557af282e5c61bd8f1f3ba70fa7948985dfcd5dfec3c8855f287d8fd39f02760ef4489a7c1b7dca00adf50a7837acee3e0 SHA512 eb844e3b08671e2bfa4a326e612781702a0f83ce7b90427f9d60b5c2343267b6a62a78c5279bce0a31908ded9d531eaa1c2fce9e6ba593b36b175b0f687a2559
+DIST x86-bin-libreoffice-kde-6.4.7.2_p1.xd3 17414679 BLAKE2B acb084343f735bf0d0cce5eca48a0c66f36ee59d189ba76e664fb65cac76663a83baf7ec921b1a601e142f2a3f4cf90a7a53479c6459dd766a04dd749a95cda0 SHA512 30b6ad2b27ccd3c2e26e0da6a868fa48e5e5648e235cc056f5186718f688fc937158f01ebd8b3916819dab9339db812e470d1543a2254ef8b57b9a92b25b1a72
 DIST x86-bin-libreoffice-kde-java-6.4.6.2-r2.xd3 27515503 BLAKE2B 3044048d4f7ec8e984ff9e07a3916f5db8f49fd9e10949a31d063ac9daafe916c109a6367959ce5156d14b894ee6ca31be288850e6107c2b83078b59063d4b6c SHA512 98fe91afa0928f7dded76f0088a04cfecf05bf41c5d5b4bddfeac3a37af6fd8e763e21dafe6da234f28e18cd4e51d8b3582ba4c2c2c9d9c72048626e17cb3004
 DIST x86-bin-libreoffice-kde-java-6.4.7.2.xd3 27347786 BLAKE2B 8465ff9ef846358c1510608febebf53eab83478fdada01a2ffc8d9b0b26ae11d3d78996a6eafc87c475a79d3acc93e26b6367ab142be4c2991eb82b70876a861 SHA512 c8ed84cb3b9144fb0e7921b7990b941d4d8ee0932b4ec02108a0a279b78789da6a7ab4d8feaf7523e987e9a99fb65bafe1bc195b6cc98a2f744c3039c1c71940
+DIST x86-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 27725217 BLAKE2B 30ef34c9234fda34194e11abac36522a97dde1b62ada1cc67fdd54d03f805ca1c65ad9a97c7484023801d15644a85a652c2f4c30c32c18a715bd3b9dddb263da SHA512 753ec089ed19f65fa2b371f02fb3183d34f9f280d6ecb3c93698f394f4376de89b7111d0a8248379f7ee96ae28cc770b66f3efbba5804403f390131fd29d476d
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p1.ebuild
new file mode 100644
index 000000000000..66793b0fe6ae
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_8 )
+PYTHON_REQ_USE="xml"
+
+inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.7
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-libs/boost:0/1.74.0
+	dev-libs/icu:0/67.1
+	dev-libs/liborcus:0/0.15
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/0.9.18[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-9.3.0
+	>=sys-libs/glibc-2.32
+	virtual/jpeg-compat:62
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+	${BIN_COMMON_DEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	app-text/libnumbertext
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2
+	dev-db/unixODBC
+	dev-lang/perl
+	>=dev-libs/boost-1.72.0:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	dev-libs/liborcus:0/0.15
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.28[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	net-print/cups
+	sys-apps/dbus[X]
+	gnome? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	!kde? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	dev-db/mariadb-connector-c
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.8 )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild b/app-office/libreoffice-voikko/libreoffice-voikko-5.0-r1.ebuild
similarity index 94%
rename from app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild
rename to app-office/libreoffice-voikko/libreoffice-voikko-5.0-r1.ebuild
index a3f28fbbb567..5a72ac24f936 100644
--- a/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild
+++ b/app-office/libreoffice-voikko/libreoffice-voikko-5.0-r1.ebuild
@@ -14,7 +14,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="app-office/libreoffice[odk]
+DEPEND="|| (
+		app-office/libreoffice[odk]
+		>=app-office/libreoffice-bin-6.4.7.2_p1
+	)
 	dev-libs/voikko-fi"
 RDEPEND="${DEPEND}
 	dev-libs/libvoikko"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 0a21ad26aa2e..67299da571be 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 710d16db31fa..95bfcd44159d 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,3 +1,3 @@
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
-DIST po4a-0.60.tar.gz 3799018 BLAKE2B cecc260af82318fa4dfeab7ef81a29256f6531d8d97afe379d0e3291197f5b9bd0a4379697f23186de0a70ff3476cedae98bedd19bf7cddf59e9503ffbc90202 SHA512 b1e32169221d6aaf49fa0e6a42e45a858c8608a62470e5d5b769da985e4d03e09a220384400fe36f740447770331f7b8b821f00dc9ce68d3c7b00178c146c6a9
 DIST po4a-0.61.tar.gz 3863796 BLAKE2B f10c7d8b42c32be1b100f724e6d0d1b419e5ed10e0762c45bda8d91bbec7d5de331265611edc8cfcb04e3afeb044258697a54bea996240c27eb113f2f6aa0df3 SHA512 51038a3d2b2056de9bb258bc0b83dba4dec4414d6a06dedc17067441fba6824cd93296308abaa418248e3583bfacd6c81621fa6eb42e5596a3c29968ce154e77
+DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index a6016b45c7ed..7444d4ee569f 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 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 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,8 @@ RDEPEND="app-text/opensp
 	dev-perl/Text-WrapI18N
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
diff --git a/app-text/po4a/po4a-0.60.ebuild b/app-text/po4a/po4a-0.61-r1.ebuild
similarity index 85%
rename from app-text/po4a/po4a-0.60.ebuild
rename to app-text/po4a/po4a-0.61-r1.ebuild
index 8807618f22d5..ce4c88c02b9a 100644
--- a/app-text/po4a/po4a-0.60.ebuild
+++ b/app-text/po4a/po4a-0.61-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,8 @@ RDEPEND="app-text/opensp
 	dev-perl/Text-WrapI18N
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
@@ -35,7 +36,7 @@ DEPEND="${RDEPEND}
 		virtual/latex-base
 	)"
 
-PATCHES=( "${FILESDIR}"/${P}-man.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
 
 DIST_TEST="do"
 
diff --git a/app-text/po4a/po4a-0.62.ebuild b/app-text/po4a/po4a-0.62.ebuild
new file mode 100644
index 000000000000..ce4c88c02b9a
--- /dev/null
+++ b/app-text/po4a/po4a-0.62.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
+
+inherit l10n perl-module
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+	l10n_find_plocales_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	l10n_for_each_disabled_locale_do rm_locale
+
+	perl-module_src_prepare
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 869d48ce7798..12791ef48c3c 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/pgtap/Manifest b/dev-db/pgtap/Manifest
index 19639e4092a5..28721785989d 100644
--- a/dev-db/pgtap/Manifest
+++ b/dev-db/pgtap/Manifest
@@ -1 +1,2 @@
 DIST pgtap-0.99.0.zip 275915 BLAKE2B 33499dacc0019ecbe85ff3dc4fcc243b6102e0b7e7018d70b17cda44b8d22d8260229ab732db9900296232e0801070722bf97a752734ea7d389dc8ae57198b6f SHA512 c1b39bf2c041d759006d692229a67af1520b6a3d23fdac43f0781cac9ce69e7714fc854d1e45f1cb3ee188a20dccfb7904bc4dd1513699189fae70f425c13b5f
+DIST pgtap-1.1.0.zip 306590 BLAKE2B efde91e26fafc8300fa39b80d90eef134ebf3a309fca3248f61e2b8beb76b94d83b035d76c789509297f0bec48f35b5947b49e2da211826cd9d828145783607d SHA512 1cade794d738fc6b78d53a0feceff4e6c0e988fbcfe8cd9e8dbf62e2bea25d2e714baac55575e99f6d74ae0b7e5277770a69c8af7dbb5714913ea7435cf493fc
diff --git a/dev-db/pgtap/pgtap-1.1.0.ebuild b/dev-db/pgtap/pgtap-1.1.0.ebuild
new file mode 100644
index 000000000000..ca1636c707c5
--- /dev/null
+++ b/dev-db/pgtap/pgtap-1.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+
+inherit postgres-multi
+
+DESCRIPTION="Unit testing for PostgreSQL"
+HOMEPAGE="https://pgtap.org/"
+SRC_URI="https://api.pgxn.org/dist/${PN}/${PV}/${P}.zip"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="${POSTGRES_DEP}
+		app-arch/unzip
+		dev-perl/TAP-Parser-SourceHandler-pgTAP
+"
+RDEPEND="${DEPEND}"
+
+# Tests requires a running database that match up with the current
+# testing slot. Won't run from ${ED}, want's to install too early.
+RESTRICT="test"
+
+src_configure() {
+	:
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0352719a66a2..f7ebc19583ab 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 48cf073feef4..a69e2856f2d8 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,6 +1,7 @@
 DIST erlang-23.0.4.tar.gz 56394805 BLAKE2B 10a4e9e3084ad2d1bb10fa736d86eb03fa6b249f83b9d06bfef4c37f99ad86dd1415c2fbaa1524cddaf57dd228d25f388fa9fe9f5b4a03ba7477080e11020fb1 SHA512 53d4b7a5e76113bb3a9695a266e58dbebb57887b1eea4e8acb56bb85d194295231d739719d526dfc6d1f0bf745d7f059fdf5ec9dc79859f5b16a75c4d0a6b348
 DIST erlang-23.1.1.tar.gz 56498218 BLAKE2B cd513a2d45aecc12503df8765e0f4170001373c0e6b35b4c01d7471906408558a3b6bbf9c189858fce3cb8fd7020270813550e2099f04c8094afc49dcd070016 SHA512 572164e601796bc7b0df3818c859b23872f148dcc72f44f611d9d5684b0c9974b00496aa0fd521dc01d0d3481556b6641d3cbd859bd7bfadefd15115728d16d9
 DIST erlang-23.1.4.tar.gz 56503340 BLAKE2B f4b26aa5882bb3d2218897706734798a80cbb5113008be70b2a0c793a5cc1eb01eb1ace17ae525e19f176e47ffc85b108240b7fec71cf8eedb4d67860ecaa98b SHA512 864b69fc69f3843dfe839faf1c1e86ec505282ec4d86ed1add445998ba28bcc623522471d8d8636a9cf1e24e84f99d5cae3880a4b1171abab9651ef242a55367
+DIST erlang-23.1.5.tar.gz 56508089 BLAKE2B 7784cbed8df68d449cbace6d84b37208b739a3b12fbed1117f05c765883d348e877001f5eba15ffdec5acc47725bf69d06a7f02b48766efa5496a8326fb8eb8c SHA512 dccb863ace1f3c3fd17c848bf21c982338546e2be2a3b81ade35bcefeb4ff75afff28ebe2363ccf7f4680417f83bbeaa51c74274a23621139b5a4be6bb824955
 DIST erlang_doc_html_23.0.tar.gz 36238699 BLAKE2B bce5fb1d766d3a795728cf7c00529129690f52e5dbe7363095cb7e63d5331a4dfc05c2042d24f10c7f3facbd187284aa323a92c0ed7515c1750aee4cd890fbd4 SHA512 bd0b1adf8639674d31152024e1351105249c6e6f93f28362e9e4b66ce6daadbe5eef5917a5889c926130e81bd000cfc44895ebaa309bf9a0c1c125713b715927
 DIST erlang_doc_html_23.1.tar.gz 36285075 BLAKE2B e2e24ac4cecfc9c10853fd3718e8e332579a91bf25eaaf9e0fc2044d89bcd6d03fd251d6a8ab64a86439f1244e275ef398701b47933a741d4e64016838db48aa SHA512 c8fecb08344c9c7a4c7b911ac4f73e2d8c0c3778d665098c3377e055346a7ecfcc378bca28dff768c36dc7bf7447308f4fb58273875c22f2d6cd896fd6232656
 DIST erlang_doc_man_23.0.tar.gz 1383486 BLAKE2B 63a9989c26797fe07fbd0ccca0d8425d94bc60a86fa93b5332c8d1f3e12a0071d9e6d4759be73bf44bf35dd14723b9e6707a84ba834e1775bc28aeec1edbe168 SHA512 81575ce7b267f5bb48bd844808e8edd4e373640bbc481372b288602eb9d3c9917e6c7c040c035b63a2f6edf437c3d826d6afdf5801765b51d9edd4a3b2a5b16f
diff --git a/dev-lang/erlang/erlang-23.1.5.ebuild b/dev-lang/erlang/erlang-23.1.5.ebuild
new file mode 100644
index 000000000000..a809e52a684b
--- /dev/null
+++ b/dev-lang/erlang/erlang-23.1.5.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit elisp-common java-pkg-opt-2 systemd wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/18.2.1-wx3.0.patch
+	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-23.1.2-ac2.70.patch
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	./otp_build autoconf || die
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+		$(use_enable hipe)
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl "${EPREFIX}"/usr)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		# Note: we explicitly install docs into:
+		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
+		# To maintain that layout we gather everything in 'html-docs'.
+		# See bug #684376.
+		mkdir html-docs || die
+		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init-r2 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 78862cadd504..e8d4a9d2945a 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/dqlite/dqlite-1.6.0.ebuild b/dev-libs/dqlite/dqlite-1.6.0.ebuild
index 6141fc58dc01..460315ba8ec1 100644
--- a/dev-libs/dqlite/dqlite-1.6.0.ebuild
+++ b/dev-libs/dqlite/dqlite-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/glib/glib-2.66.3.ebuild b/dev-libs/glib/glib-2.66.3.ebuild
index 86bc085f42a3..b7910e438a34 100644
--- a/dev-libs/glib/glib-2.66.3.ebuild
+++ b/dev-libs/glib/glib-2.66.3.ebuild
@@ -30,7 +30,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 # them or just put the (build) deps in that rare consumer instead of recursive
 # RDEPEND here (due to lack of recursive DEPEND).
 RDEPEND="
-	!<dev-util/gdbus-codegen-2.66.0
+	!<dev-util/gdbus-codegen-${PV}
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
 	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
index eec6b6bd9683..78b7778fe10f 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 23e6044116e3..5150e4c431a4 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -2,6 +2,9 @@ DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f0
 DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb0354636d48aabb76fa1786139c669c9d8ca105d79cc8416dd20683818eccc84490cdadc9ca94cb2b0e411644e923a3d6 SHA512 19226da3bc9776e1da40b8e94dfa53564d5e6acc80edee539ba12d7a75c1bb8c0603e7633f26a6ef8b12adc56bb677ccda448575aa6be2ad3df5447465a4b080
 DIST libressl-3.1.3.tar.gz 3766345 BLAKE2B 4956fa0ae6030e9e9969d584db3bc0084c4b155207d1472ebfa40c8e68e925214b66ed1bc7e32d98a9a48de0b61909323a0380a973c724422c92bfe88b9fdfb2 SHA512 f9f497fe5d09b8b762175da038a8e67d9d2567462fefc49e434d306a3071ba3a4d369c89143d9d90e3bbcc7b9ba051c9c923a0dfc41d856edc08ae59fa727ee8
 DIST libressl-3.1.4.tar.gz 3767238 BLAKE2B e639349e50f985360f2cef01b16b5c8f3c725d4a9bbee1117787174e4de6eb9b14cc8ad5f1704971057dd0f5000eea01f3b172178c534c70d38921418034d94c SHA512 77a53c4294fc332006502dc3af069346e2c9efc9240de7f91eb48e89043525900b5b23652cfd159221c3a482cc01e263611adb752e23b707f965156e3a7cd895
+DIST libressl-3.1.5.tar.gz 3767605 BLAKE2B 9dc97caac831591c150ef0fc9b36970e5c18b1793294b074b5c42176cd7eafbdb713461757edab7072fc0a770480db5987252c9a960cfebeaa3ef5341de2a290 SHA512 b1e576a654d4f740ef466e5291344ee9a65276f2a1d4975bf93c407b8b51d78dd99f381f1d14162ed1f6b6e7f14a67ccdd377e7d9f71ef2875cc8cf17f580c51
 DIST libressl-3.2.0.tar.gz 3775925 BLAKE2B 99d74fad16e272be8e3b23b873c35970ce3693e088baf365670ad8e8cbb846e90f4232bbc6c65b70a35060da99b9b210b3debce1c78d531e810de26e3e2f05cb SHA512 e8bf95af4e4e855b0462eb12df8f802102a3bee5bb40fb1859e7c40d9e3ce89f0d2eb0acdd923e7c592b4aeb7ecc556f753c0a12d0dace05d2ef342bffdd9d07
 DIST libressl-3.2.1.tar.gz 3798341 BLAKE2B 25d4d0fa758d92fd781f39000e631d7cec0a5a8210b2b127b7d49ef0e96e1a20a45f60e6231dcbe379f57f19c1ca8a4dde6205b1cc52ee44d17a4a21da34c98a SHA512 0204177ad0291f3fce4c77ab21cce17785d0239f2ae4be8fbdce5575cc98775186caa0e1851b211c05be07e3cc603111eeaac4379c8977e7b140fedee2551f93
+DIST libressl-3.2.3.tar.gz 3839953 BLAKE2B 219c9c2e78952d56dd9eadb92c9732f426cbdd20a2dc905d827ca0547a347065f3347e960dee7456994d8d52d8cb19a028add3e9f343a20864dbb15f4e6654c8 SHA512 8c281f5a155a4cc9bfeb31767d8c29de6ceec602649ff98460c44c4b2c15999799d5549ce07a823a4f7f20f9b441f8718b3ef8eac19ddb6cf6d150e6fe8c9d13
 DIST libressl-3.3.0.tar.gz 3837684 BLAKE2B 0b2947fa00f86829b574beedc462ed7e602b417f057c8bcf966508952e10c17709a4ea484e4b8699eee2cee228e00518a25c9eedd96534273c56a467cdc0c39b SHA512 3ea1339719b85234e4db8753eb11b760b9969bf0917d2556126bb048fc41022def628995587e438781092dcc49233109641b174f156cc4ec451fe8a217372cec
+DIST libressl-3.3.1.tar.gz 3838592 BLAKE2B 67c5bd72c1d1085c13fd3bf2e3829a6b83d61c3c9af5f5e65dca7548abe967f0ec8ebe3c46c6af576c54304b432069aab9d940bded90925cb44fffa7a8f35c29 SHA512 a0a6c10af71c6932a63381f33b2d0fe38b28d1c3c62c0c2de770695152f6eb3c558fdedd2fb6cdf34bd9a2dd3887aec615b652cbc3c1eed6c3c973c787a0c294
diff --git a/dev-libs/libressl/libressl-3.1.5.ebuild b/dev-libs/libressl/libressl-3.1.5.ebuild
new file mode 100644
index 000000000000..ab31f2041689
--- /dev/null
+++ b/dev-libs/libressl/libressl-3.1.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libressl/libressl-3.2.3.ebuild b/dev-libs/libressl/libressl-3.2.3.ebuild
new file mode 100644
index 000000000000..ab31f2041689
--- /dev/null
+++ b/dev-libs/libressl/libressl-3.2.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libressl/libressl-3.3.1.ebuild b/dev-libs/libressl/libressl-3.3.1.ebuild
new file mode 100644
index 000000000000..2ffee4c0167e
--- /dev/null
+++ b/dev-libs/libressl/libressl-3.3.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	#eapply "${FILESDIR}"/${PN}-3.2.2-build.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
new file mode 100644
index 000000000000..66e66cd2dc80
--- /dev/null
+++ b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single autotools
+
+DESCRIPTION="Universal configuration library parser"
+HOMEPAGE="https://github.com/vstakhov/libucl"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vstakhov/libucl.git"
+else
+	SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="lua +regex sign urls +utils static-libs test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="!!dev-libs/ucl
+	lua? ( ${LUA_DEPS} )
+	urls? ( net-misc/curl )
+	sign? ( dev-libs/openssl:0 )
+"
+BDEPEND="${DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md doc/api.md )
+
+src_prepare() {
+	default
+	rm tests/schema/{definitions,ref{,Remote}}.json || die
+	eautoreconf
+}
+
+src_configure() {
+	lua_setup
+
+	local myeconfargs=(
+		"$(use_enable lua)"
+		"$(use_enable regex)"
+		"$(use_enable sign signatures)"
+		"$(use_enable urls)"
+		"$(use_enable utils)"
+		LUA_INCLUDE="$(lua_get_CFLAGS)"
+		LIB_LIBS="$(lua_get_LIBS)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+	use lua && DOCS+=( "doc/lua_api.md" )
+	einstalldocs
+	if ! use static-libs; then
+		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
+			die "error while deleting static library"
+	fi
+}
diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild
index c4c4911fe043..66e66cd2dc80 100644
--- a/dev-libs/libucl/libucl-9999.ebuild
+++ b/dev-libs/libucl/libucl-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit autotools
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single autotools
 
 DESCRIPTION="Universal configuration library parser"
 HOMEPAGE="https://github.com/vstakhov/libucl"
@@ -18,11 +19,12 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-
-IUSE="lua +regex sign urls +utils static-libs"
+IUSE="lua +regex sign urls +utils static-libs test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 DEPEND="!!dev-libs/ucl
-	lua? ( >=dev-lang/lua-5.1:= )
+	lua? ( ${LUA_DEPS} )
 	urls? ( net-misc/curl )
 	sign? ( dev-libs/openssl:0 )
 "
@@ -36,24 +38,31 @@ DOCS=( README.md doc/api.md )
 src_prepare() {
 	default
 	rm tests/schema/{definitions,ref{,Remote}}.json || die
-
 	eautoreconf
 }
 
 src_configure() {
+	lua_setup
+
 	local myeconfargs=(
 		"$(use_enable lua)"
 		"$(use_enable regex)"
 		"$(use_enable sign signatures)"
 		"$(use_enable urls)"
 		"$(use_enable utils)"
+		LUA_INCLUDE="$(lua_get_CFLAGS)"
+		LIB_LIBS="$(lua_get_LIBS)"
 	)
-	econf "${myeconfargs}"
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check
 }
 
 src_install() {
 	default
-	DOCS+=( $(usex lua "doc/lua_api.md" "") )
+	use lua && DOCS+=( "doc/lua_api.md" )
 	einstalldocs
 	if ! use static-libs; then
 		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index a4e3450e711a..49b73ef3c565 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -6,3 +6,5 @@ DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e96248
 DIST openssl-1.1.1e-bindist-1.0.tar.xz 16948 BLAKE2B 78e034f1d263cbf5e57c92393f72acd07e86e39a5511a8852bad151371430954e07d787fd82cca55b373d1579bb22b9d29c9d677104ed68291a9d2dffe3ffbbb SHA512 0dbfb378b8f2724db82915e17fd4e43977e3e45030db25cdb9241c0ab842e41ef3d597ef71c4db5103635752dc2059ea6022597511a440f55fb56a5a52d3ccea
 DIST openssl-1.1.1g.tar.gz 9801502 BLAKE2B 5e3dd4725ff89b959a5436d64b521317c6ffeb377418cc24c6d1927fab923423cb5f5fce2f9c2cdee597041c7be156d09668a5fd13dc6ff06d235a83db94cf19 SHA512 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
 DIST openssl-1.1.1h.tar.gz 9810045 BLAKE2B ac9ba6fb0c4da0a761e8655b6907634365ddb114216acfcfc981e13c211577b6bd23ea8d2ad0999c0960b039f5d3dead5733e6dc07c5231ab953307a9015cd36 SHA512 da50fd99325841ed7a4367d9251c771ce505a443a73b327d8a46b2c6a7d2ea99e43551a164efc86f8743b22c2bdb0020bf24a9cbd445e9d68868b2dc1d34033a
+DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
+DIST openssl-1.1.1i.tar.gz 9808346 BLAKE2B ca98bab08e1874134da113dd0bda0583c133c7dce5b739f9601641ed2cf97894e5e13d901f0db9367aa5d7b78c552ac598aa0a3c2a3f0a438daae044e29f58d6 SHA512 fe12e0ab9e1688f24dd862ac633d0ab703b499c0f34b53c3560aa0d3879d81d647aa0678ed517dda5efb2711f669fcb1a1e0e24f6eac2efc2cf4eae6b62014d8
diff --git a/dev-libs/openssl/openssl-1.1.1i.ebuild b/dev-libs/openssl/openssl-1.1.1i.ebuild
new file mode 100644
index 000000000000..572b1945be6e
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1i.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
+# for more details:
+# - hobble-openssl (SOURCE1)
+# - ec_curve.c (SOURCE12) -- MODIFIED
+# - ectest.c (SOURCE13)
+# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
+BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz"
+
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	bindist? (
+		mirror://gentoo/${BINDIST_PATCH_SET}
+		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
+	)"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+S="${WORKDIR}/${MY_P}"
+
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if has test ${FEATURES} && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	fi
+
+	# keep this in sync with app-misc/c_rehash
+	SSL_CNF_DIR="/etc/ssl"
+
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| die
+
+	# quiet out unknown driver argument warnings since openssl
+	# doesn't have well-split CFLAGS and we're making it even worse
+	# and 'make depend' uses -Werror for added fun (#417795 again)
+	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
+	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# Make sure user flags don't get added *yet* to avoid duplicated
+	# flags.
+	CFLAGS= LDFLAGS= echoit \
+	./${config} \
+		${sslout} \
+		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
+		enable-camellia \
+		enable-ec \
+		$(use_ssl !bindist ec2m) \
+		$(use_ssl !bindist sm2) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-e 's:\(^\| \)-fomit-frame-pointer::g' \
+		-e 's:\(^\| \)-O[^ ]*::g' \
+		-e 's:\(^\| \)-march=[^ ]*::g' \
+		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
+		-e 's:\(^\| \)-m[^ ]*::g' \
+		-e 's:^ *::' \
+		-e 's: *$::' \
+		-e 's: \+: :g' \
+		-e 's:\\:\\\\:g'
+	)
+
+	# Now insert clean default flags with user flags
+	sed -i \
+		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/raft/raft-0.9.25.ebuild b/dev-libs/raft/raft-0.9.25.ebuild
index fc81de79a010..b1d2d3822b20 100644
--- a/dev-libs/raft/raft-0.9.25.ebuild
+++ b/dev-libs/raft/raft-0.9.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index e3dd8f55a177..a80577324d35 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,3 +1 @@
-DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c SHA512 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
-DIST re2-2020-10-01.tar.gz 403344 BLAKE2B 163d44991dc80dc04871bc53c64d4eec9f9e8db36b057a44eba3b1f033f0b130d7fccf4ba8aec33cc515ab5b11bd4f5b0343b4381758e8d9446c5017f1f04d14 SHA512 cd620878ffa6d4e47f1583f27a179f6520fc1226554bd7c0e104d3d45b2bee70873c0d661e87eb4a9d912b58f86f115766c35d08e124f5f67ddcc3b50535f726
 DIST re2-2020-11-01.tar.gz 402756 BLAKE2B 4c5bb5d4859f5b822408483a90a37b4f7e18d3ee81ecfe52563b091c0594dc32343257521c53267ff0c4b62a81a58b2231b628915afd94d368aebf13b965921e SHA512 167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe
diff --git a/dev-libs/re2/re2-0.2020.08.01.ebuild b/dev-libs/re2/re2-0.2020.08.01.ebuild
deleted file mode 100644
index 69b48d1d9c89..000000000000
--- a/dev-libs/re2/re2-0.2020.08.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="8"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}
diff --git a/dev-libs/re2/re2-0.2020.10.01.ebuild b/dev-libs/re2/re2-0.2020.10.01.ebuild
deleted file mode 100644
index 9b7e0bf86ea7..000000000000
--- a/dev-libs/re2/re2-0.2020.10.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="8"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 7d2f9eb1be87..924de9310b8d 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
index 2b180c6dc0d5..374c3077b81c 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( NOTICE README.md TECHNOTES.txt )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
index cb73196e10c0..68fd925dfe8b 100644
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_NAME="mailparse"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 PHP_EXT_NEEDED_USE="unicode"
 DOCS=( README.md )
 
@@ -20,9 +20,3 @@ DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME complian
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-
-src_prepare() {
-	# Missing test source files in archive.  Fixed upstream in next release.
-	rm tests/011.phpt tests/bug001.phpt || die
-	php-ext-source-r3_src_prepare
-}
diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
index 18221a56290e..775332d83c50 100644
--- a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
+++ b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
@@ -6,7 +6,7 @@ PHP_EXT_NAME="oauth"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
@@ -17,12 +17,11 @@ LICENSE="BSD"
 SLOT="7"
 IUSE="+curl examples"
 
-DEPEND="php_targets_php7-2? ( dev-lang/php:7.2[hash(-)]
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
-	php_targets_php7-3? ( dev-lang/php:7.3[hash(-)]
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
-	php_targets_php7-4? (
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+DEPEND="
+	dev-libs/libpcre:3=
+	curl? ( net-misc/curl:0= )
+	php_targets_php7-2? ( dev-lang/php:7.2[hash(-)] )
+	php_targets_php7-3? ( dev-lang/php:7.3[hash(-)] )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
index 6e305b0c2cc6..f02e197d9ef6 100644
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -1,2 +1,3 @@
 DIST timezonedb-2019.3.tgz 413166 BLAKE2B 99542a2c0dc50d96316dc14b22c8a2404db07a88d3f46050a954f10bfb501cd81fb7161805a91336075d607ac106208285e6d2281a9ed68b344fd4837fabcb49 SHA512 8342a0ed83a52ade0415430751d4efeaa84fb72e7da3aec8921338e9dfbf37ff1f098f6b6e1ed9c8f1c9c62017a0fe9c14f86a53be72f8b9f1ec137fa45d057d
 DIST timezonedb-2020.1.tgz 413993 BLAKE2B 1f598269060c7f228d103549ac31429df3e31e68961fb41182101400c9f71ea8503cb11943732b49b749aa055e7eedfb4fd06e11cc11c1381bc69f294c3433b6 SHA512 31c38d5b25db921ec5be924ac85d9cf9dd2180c4e2d50e074a143dfdf9415a8c7579e96f7a768b305554bf1cb332b46f2c652fda7d2f1638502b995fc0679ca5
+DIST timezonedb-2020.4.tgz 414667 BLAKE2B 1a219a090ae33a9f3eef76ab52e2bafd453a1f1161bbeeb53ee995d090f3fdd03c7a658a93ade72e3e1ae61df9d646eaef85dd4cacb5cea45c00adcfac8d6651 SHA512 d5c41c76b4b0b033464a4f086072d061504fc439c910c47a7077a0586b308cc37a4202ff9f418a39cee63534d55136d15a173bb94923160c0fa16bb33ac89a09
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild
new file mode 100644
index 000000000000..a390fa7584ed
--- /dev/null
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="timezonedb"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/pecl-translit/Manifest b/dev-php/pecl-translit/Manifest
index e03c2164d656..15715b90d65c 100644
--- a/dev-php/pecl-translit/Manifest
+++ b/dev-php/pecl-translit/Manifest
@@ -1 +1,2 @@
 DIST pecl-translit-0.6.3.tar.gz 227419 BLAKE2B ebff291a00d61bb4f8e2c47e26baef4278f317be8acd7e5265d3056f8992e6b7e792718c86633277c4a0af5403e253b317241a71aba9b73079a8efb53389ab30 SHA512 5b5e3097a972e45424696abea4d4698fc6c7b6598f1a76754224a4b66776752a01b3bad52bc14afb8cc6e75d36c4558677e609a379898cdd91a5b0a652155cd1
+DIST pecl-translit-0.7.1.tar.gz 227287 BLAKE2B 4d9c9a74ec775d720bf4f2742460e7c96f52bac7b0ddec71622818d5e257bf468092b067ce33b335eee78ded8f2e74f0378acb22a18ef7a30db57a78d9215939 SHA512 62a2a26dbc01bd802c16ab0346d8c2a1960c1066b221bc05d609ca49fef26e9ffbbee9b685fbd82ca9b02be954fbd7f5eb2d9de307c746a792b8785f44e64d46
diff --git a/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild
new file mode 100644
index 000000000000..5c7709ce8eff
--- /dev/null
+++ b/dev-php/pecl-translit/pecl-translit-0.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"
+
+PHP_EXT_NAME="translit"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+PHP_EXT_NAME="translit"
+
+inherit php-ext-source-r3
+
+SRC_URI="https://github.com/derickr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://github.com/derickr/pecl-translit"
+
+DESCRIPTION="Transliterates non-latin character sets to latin"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
index f030569d725f..65d0a5fb0ec5 100644
--- a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
+++ b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INIT="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9b88da2dfc6f..801ced1fe1fa 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
new file mode 100644
index 000000000000..6d2135d93a5c
--- /dev/null
+++ b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+# sgmllib is licensed under PSF-2.
+LICENSE="BSD-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+# Tests have issues with chardet installed, and are just kind of buggy.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-sgmllib.patch"
+)
+
+python_prepare_all() {
+	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
+	ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
+	cd "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 --no-diffs -w -n feedparsertest.py || die
+	fi
+	"${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/mock/mock-4.0.2.ebuild b/dev-python/mock/mock-4.0.2.ebuild
index 19b6806602fb..d658150ed21e 100644
--- a/dev-python/mock/mock-4.0.2.ebuild
+++ b/dev-python/mock/mock-4.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -23,6 +23,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]"
 
+src_prepare() {
+	sed -i -e '/  pytest.*/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	# Upstream supports running tests only in their dream pristine
 	# environment.  pytest doesn't work at all if mock is already
@@ -40,6 +45,9 @@ python_test() {
 			mock/tests/testmock.py || die
 	fi
 
+	# Avoid pytest dependency
+	sed -i -e '/import pytest/d' mock/tests/testhelpers.py || die
+
 	"${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/parameterized/parameterized-0.7.4.ebuild b/dev-python/parameterized/parameterized-0.7.4.ebuild
index b7d6d18a9caa..3a9214d03bf5 100644
--- a/dev-python/parameterized/parameterized-0.7.4.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.4.ebuild
@@ -15,4 +15,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
 distutils_enable_tests nose
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index e8996611594a..fe0d06794b25 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/cmdparse/Manifest b/dev-ruby/cmdparse/Manifest
index aa9c3bdc8912..e014d20b63f4 100644
--- a/dev-ruby/cmdparse/Manifest
+++ b/dev-ruby/cmdparse/Manifest
@@ -1 +1,2 @@
 DIST cmdparse-3.0.6.gem 54272 BLAKE2B 04d1ce8a10a716c913eb6def6e6abd72c4ca5aeb2f761c0fd84d95cce524d853f89d959d2babf078e313b4f7ca738ce7bb3da1027c77c0811cb7c81bf89cb6cf SHA512 c097d0d85c4da423d393bfef875d214221543db19f1fa8f66ea711090e468a67250480ecb8c113d29b77173cd48e809cd3afb5a810cd62986abf066a568515ca
+DIST cmdparse-3.0.7.gem 54784 BLAKE2B 2ce8b26b362ed78cd6e5ecc1d678c32a6065dc38c402e82f6715ee2bd834c49bcca2ec93d2dd11d2ae2ac809068efa4fe640f98f367c4278da6d0cccae094222 SHA512 5ee929c9aaf6254686a916fa11e4f4809693434f2cff7ad5e14aef2b1a95bfcd2e818afc0e4337616836971a85c980b76e89bbe61f6be250c372ec0587dc58b0
diff --git a/dev-ruby/cmdparse/cmdparse-3.0.7.ebuild b/dev-ruby/cmdparse/cmdparse-3.0.7.ebuild
new file mode 100644
index 000000000000..1c3fbb262809
--- /dev/null
+++ b/dev-ruby/cmdparse/cmdparse-3.0.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+IUSE=""
+
+DESCRIPTION="Advanced command line parser supporting commands"
+HOMEPAGE="https://cmdparse.gettalong.org/"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+LICENSE="MIT"
+SLOT="3"
diff --git a/dev-ruby/tty-reader/Manifest b/dev-ruby/tty-reader/Manifest
index f48ae80543f9..34557f835983 100644
--- a/dev-ruby/tty-reader/Manifest
+++ b/dev-ruby/tty-reader/Manifest
@@ -1,2 +1,3 @@
 DIST tty-reader-0.7.0.gem 25600 BLAKE2B 41af0db92c337cdebb428a93b924f466d72f67042267abd4b3cc97a319e01757c2f1f302ec0002de5b90fa1ebecca0d6bffcdc621be2e435d549263779ed3712 SHA512 29f41a15ff9d86300d9cb6067028a2bf540d258d8a8ca11892e26d40e423854ce32706a33a5cb75037d99d8d30d42998ecc6876a99f3c30bbddacffe61fbf70e
 DIST tty-reader-0.8.0.tar.gz 459623 BLAKE2B c787eebf03fa6169e710d7f838ee02f558577bbd806988e088a9f950c3cf5ef6d4f9e3569f2a29f4a81bcaa2222e029128dc48e439eae075741b077e42c70246 SHA512 8fbae094bbba287c2a2176e9838d0769ad33d6d464165f8b46484d47902ce4131842f196d3b7c0fa6f9be10bb37e2315b1dba517d46872b6f8e5a4fb3a6790da
+DIST tty-reader-0.9.0.tar.gz 461051 BLAKE2B f2a48a929fc7ec0f6f98e4508ed50638e041939ae2eadf96cb8d04e4a771304e63648d5c3a85581fef3ae4740a570114e8d427637c6b3a05ece400f7963a26cb SHA512 2480f480a6ab0fa0854386ba0c31b5e78ff53a2d65b23825b13e50929337f56f8e38d1277f61509139cb43eddd8a933fadcd9d3c916c9dbaacf4dac1ec38dbaf
diff --git a/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild b/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
new file mode 100644
index 000000000000..93626606fa04
--- /dev/null
+++ b/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="tty-reader.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Methods for processing keyboard input in character, line and multiline modes"
+HOMEPAGE="https://github.com/piotrmurach/tty-reader"
+SRC_URI="https://github.com/piotrmurach/tty-reader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/tty-cursor-0.7:0
+	>=dev-ruby/tty-screen-0.8:0
+	=dev-ruby/wisper-2*
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a1ccdc34685e..d206bb809749 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index e173db4d2b68..473414c4997e 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1 +1,2 @@
 DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2
+DIST gnome-builder-3.38.1.tar.xz 12077860 BLAKE2B 68dfbf9aeda93c695035a51c020735a914a11a09d7106228c2b7fe603b3b1b7b292f6a110c77df2057d40ae7f0c7559cb48c6ecc888de2767984a03d34467a2f SHA512 50872a7285292f4e29acec153a7ba4616ab8e69529fbc7682fb74fa9d8b5c49ed52b939c7652bcf410444e2c2de969280b82ab4da44008f4b95863bfd52ac59a
diff --git a/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild b/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild
new file mode 100644
index 000000000000..73796652f6bc
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+# TODO: automagic libportal dep
+# TODO: automagic sysprof dep for tracing paths from toplevel meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.37.0[introspection]
+	>=dev-libs/glib-2.65.0:2
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.19.91
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection]
+	>=x11-libs/vte-0.40.2:2.91[introspection]
+	>=net-libs/webkit-gtk-2.26:4=[introspection]
+	>=dev-libs/libxml2-2.9.0
+	git? ( dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
+	)
+	dev-libs/libpcre:3
+	dev-libs/libpcre2
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	glade? ( >=dev-util/glade-3.22.0:3.10= )
+	spell? ( >=app-text/gspell-1.8:0=
+		app-text/enchant:2 )
+	sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] )
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? ( $(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	') )
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer (rls plugin now disabled by default); Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dchannel=other
+
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang plugin_clang)
+		$(meson_use devhelp plugin_devhelp)
+		-Dplugin_deviced=false
+		-Dplugin_editorconfig=true # needs libpcre
+		-Dplugin_flatpak=false
+		$(meson_use git plugin_git)
+		$(meson_use glade plugin_glade)
+		-Dplugin_podman=false
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_update_manager=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
index b1c471e71f2a..7cf8f6da8f61 100644
--- a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='xml'
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -19,9 +19,5 @@ LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild
similarity index 95%
rename from dev-util/gtk-doc/gtk-doc-1.33.1-r2.ebuild
rename to dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild
index 6bf9e35bbd9a..44f172a60df3 100644
--- a/dev-util/gtk-doc/gtk-doc-1.33.1-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild
@@ -81,8 +81,8 @@ src_install() {
 
 	# The meson build system configures the shebangs to the temporary python
 	# used during the build. We need to fix it.
-	sed -i -e 's:^#!.*:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die
-	python_fix_shebang "${ED}"/usr/bin/*
+	sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die
+	python_fix_shebang "${ED}"/usr/bin
 
 	# Don't install this file, it's in gtk-doc-am now
 	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
diff --git a/dev-util/hermes/Manifest b/dev-util/hermes/Manifest
new file mode 100644
index 000000000000..cb1e33d2fe62
--- /dev/null
+++ b/dev-util/hermes/Manifest
@@ -0,0 +1 @@
+DIST hermes-2.8.tar.gz 61010 BLAKE2B 520110318dd0c2f2bc150b050729f9fa36c14ea5dca9a8492e77bc67618e14adb36ca35cf67b1aeb7a1e8a2dfef84fb6662bbdad21e427bff8aea4d53c271be3 SHA512 ea3378e5311202333f6eb59e301c92d9db1937e540f00283b679bd50e54312b8a98c469cf106374e9dde78a37e8997d7022569a9f81703ba445577f8cdd7e6e3
diff --git a/dev-util/hermes/files/99hermes b/dev-util/hermes/files/99hermes
new file mode 100644
index 000000000000..364c4f4d4c3a
--- /dev/null
+++ b/dev-util/hermes/files/99hermes
@@ -0,0 +1 @@
+PATH="/opt/hermes/bin"
diff --git a/dev-util/hermes/files/hermes-2.8-lua-shebang.patch b/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
new file mode 100644
index 000000000000..67058f726d78
--- /dev/null
+++ b/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
@@ -0,0 +1,23 @@
+diff --git a/lib/tool.lua b/lib/tool.lua
+index a9124f3..8c39911 100755
+--- a/lib/tool.lua
++++ b/lib/tool.lua
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env lua
++#!@LUA@
+ 
+ require("strict")
+ function tool()
+diff --git a/bin/lua_cmd b/bin/lua_cmd
+index fabc5d5..32c8e13 100755
+--- a/bin/lua_cmd
++++ b/bin/lua_cmd
+@@ -37,7 +37,7 @@ extra=
+ if [ "x$LUA_PATH" != x ]; then
+   extra=";$LUA_PATH"
+ else
+-  extra=";`lua -e 'print(package.path)'`"
++  extra=";`@LUA@ -e 'print(package.path)'`"
+ fi
+ 
+ export LUA_PATH="$execLuaPath$extra"
diff --git a/dev-util/hermes/hermes-2.8.ebuild b/dev-util/hermes/hermes-2.8.ebuild
new file mode 100644
index 000000000000..a6b7694d1f6a
--- /dev/null
+++ b/dev-util/hermes/hermes-2.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single
+
+DESCRIPTION="Lua based testing manager"
+HOMEPAGE="https://github.com/TACC/Hermes"
+SRC_URI="https://github.com/TACC/Hermes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/Hermes-${PV}
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/luaposix[${LUA_USEDEP}]
+	')
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.8-lua-shebang.patch )
+
+src_compile() {
+	sed -e "s|@LUA@|${LUA}|g" \
+	    -i lib/tool.lua \
+	    -i bin/lua_cmd || die
+}
+
+src_test() {
+	local -x PATH="bin:${PATH}"
+	tm -vvv || die
+	testcleanup || die
+}
+
+src_install() {
+	dodir /opt/hermes
+	cp -r "${S}"/. "${ED}"/opt/hermes/ || die
+
+	doenvd "${FILESDIR}"/99hermes
+}
diff --git a/media-fonts/mathematica-fonts/metadata.xml b/dev-util/hermes/metadata.xml
similarity index 51%
rename from media-fonts/mathematica-fonts/metadata.xml
rename to dev-util/hermes/metadata.xml
index cc081897d48c..e97c4322aa87 100644
--- a/media-fonts/mathematica-fonts/metadata.xml
+++ b/dev-util/hermes/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 7f1dccaa0b53..43064fc9e25a 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,6 +1,2 @@
-DIST ideaIC-2.4.202.8194.7.tar.gz 529563361 BLAKE2B 1f792d1ff8b1246d5ccaf4324d6c85dbe2491f6585c126ef38594709358512766f7ed3cbb2128b6b8db71286ef1a5c6cf8ac21bc0293b0ac9b373e55e6cae3d9 SHA512 f603416c829f1f2b47e371c18dc8706bb6b9df9d87ee6056ac7e4786d7f9c029246195c2fb3b63bb7d0c1c7bfee99911b2c0d686232aa243087e4a17c0f559d7
 DIST ideaIC-3.0.203.5981.155.tar.gz 582023182 BLAKE2B 671fbba0c2173e3780a99d0d3b106af75c4ef6df4198ced3653c1b74a7bbb055a29b1fc31eb89823bfd56e6737c7788f78a90fe7ef46e52ab410c0dff18868e9 SHA512 35d569c5e13ec620d0a476cc52c005d29ea3c7c3c1ab0614a1a73255309635c84ee00820c50584ca19af634165138c77d8d712cfe0d367b9525956ad33aafe77
-DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
 DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
-DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
-DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
diff --git a/dev-util/idea-community/idea-community-2020.2.4.202.8194.7.ebuild b/dev-util/idea-community/idea-community-2020.2.4.202.8194.7.ebuild
deleted file mode 100644
index 97ec35a8801d..000000000000
--- a/dev-util/idea-community/idea-community-2020.2.4.202.8194.7.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS="~arm64"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
-	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL ZLIB"
-
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	=dev-util/lldb-9*"
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-# jbr11 binary doesn't unpack nicely into a single folder
-src_unpack() {
-	default_src_unpack
-	if use jbr11 ; then
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-	fi
-}
-
-src_prepare() {
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	if use jbr8; then
-		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-	fi
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-	if use jbr8 || use jbr11 ; then
-	if use jbr8; then
-		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
-	else
-		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	fi
-		if [[ -d ${JRE_DIR} ]]; then
-			for jrebin in $JRE_BINARIES; do
-				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-			done
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-community/idea-community-2020.3.0.203.5981.155.ebuild b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild
similarity index 95%
rename from dev-util/idea-community/idea-community-2020.3.0.203.5981.155.ebuild
rename to dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild
index 675066ef9b53..358d9caaec62 100644
--- a/dev-util/idea-community/idea-community-2020.3.0.203.5981.155.ebuild
+++ b/dev-util/idea-community/idea-community-2020.3.0.203.5981.155-r1.ebuild
@@ -45,7 +45,7 @@ RDEPEND="${DEPEND}
 	>=virtual/jdk-1.7:*
 	dev-java/jansi-native
 	dev-libs/libdbusmenu
-	=dev-util/lldb-9*"
+	=dev-util/lldb-10*"
 BDEPEND="dev-util/patchelf"
 RESTRICT="splitdebug"
 S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
@@ -81,7 +81,7 @@ src_prepare() {
 		done
 	fi
 
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
 	if use arm64; then
 		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
 	else
diff --git a/dev-util/idea-community/metadata.xml b/dev-util/idea-community/metadata.xml
index 5ddfb4646361..3642c1e6927b 100644
--- a/dev-util/idea-community/metadata.xml
+++ b/dev-util/idea-community/metadata.xml
@@ -12,8 +12,4 @@
 	<longdescription lang="en">
 	Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
 	</longdescription>
-	<use>
-		<flag name="jbr8">Install and use the Java 8 based version of JetBrains Runtime.</flag>
-		<flag name="jbr11">Install and use the Java 11 based version of JetBrains Runtime.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index c0b6914883c8..34202325db4d 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1 +1,2 @@
 DIST kdev-php-5.6.0.tar.xz 1063760 BLAKE2B 72b3a6e77d6f569877687490f654daf79c14e2f7b374aadabbf54d7cad129c15051e72d816073d961582efa33d8354c51b2d3efa77a930ed2c81db4c5cd6668c SHA512 b6838e8eb44df1a0b2d94503c28636ce36dd63e91a8476b1f523b7457f1f831987eb3d079cbb7ed629c5c8143cd6a6f5832579ab7dc38f38162198c2cc068cdc
+DIST kdev-php-5.6.1.tar.xz 1063372 BLAKE2B 4c7d3897c67629b6aafb8a2e04d080a3ab5fd3bbbd836fe09d41cbdc29a14367fc2b1dc790375e761917b81bce08b88737a1b4a03163743fad71eea1410a5d29 SHA512 45e84c7ecf293dfa48805c3a80804f468a5fb8019ea3ced6b8cc1cb9042d84774635bc58e2d61945c3e5a2e77d1bc139ecdf9ebc408157c640ccbcaa2c26f189
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild
new file mode 100644
index 000000000000..e732610f5639
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-php"
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+IUSE=""
+
+BDEPEND="
+	test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcmutils-${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/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	ecm_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index d0f3715d1a6a..d35708f52d87 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1 +1,2 @@
 DIST kdev-python-5.6.0.tar.xz 1069480 BLAKE2B 0ceb8c1a4bd279b621844eb94eeecef4272b13e77764afeb6403d8a757d6873caf2cc5ad5a1a1eef901365c90dc11298bab21274b684c6b49c8e55388c9504bb SHA512 c6a866a563f3304aab860f66d752a617f8a0822c2e3b0f4131b8e8603f2ed86b5141ad308f967ffc5e9458693f389281a8918feea9fc584d7b4213fa265479be
+DIST kdev-python-5.6.1.tar.xz 1071080 BLAKE2B f9972f6460723bc4822b00e49ab35f74eecc86cfb642fe76d98f551519f8ab690d6c5b6bbd7db778a3a62a1d11e81f8a0ea39fda91120b951b0fb80667d52b64 SHA512 bdf05ed098cfbca395c8c82650c278f33bd5878a08527f43d555e905142b3b486267d37789cbe9bf4924162fb9c3024c13e445a2f1d408626861b96c96103e12
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild
new file mode 100644
index 000000000000..f8b45387e8ee
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index aa5ca0665efd..2c775f16899f 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1 +1,2 @@
 DIST kdevelop-5.6.0.tar.xz 7116544 BLAKE2B c548c695dab41c93aef31549bd479f1ca832a3fac9cde044523bf590d536473f36a87521ac678d37008ff451c091b843f65ccce154d9b1ca59efac2b48a81515 SHA512 c96a79d92972d606778d76f74f9dfddb9a0da9f41b462ada1a52842aa14306ad3cb183cda8103a9a3cf56d0dd5c1f18d5fad6b65cd8ae42f2fc407aaa6dc88f7
+DIST kdevelop-5.6.1.tar.xz 7130284 BLAKE2B 989218ec07d437d641033b7895b533a4f92b8c557e73bac0e3671a34335aac02936eeb3b73b95d1a7bbab6ad8b32a21f15db1d5af0485999fa2f7eb24b9e8bb6 SHA512 a03e22d57b5d556489e3e140e4cad6939170087a36afa8c755318ff6b5101806b8df82bd402e32daa715f4a72352dada1c2ce3ff4455dcac0debe6456c0bc7cd
diff --git a/dev-util/kdevelop/kdevelop-5.6.1.ebuild b/dev-util/kdevelop/kdevelop-5.6.1.ebuild
new file mode 100644
index 000000000000..262a77ad4251
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.6.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5/56" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
+
+COMMON_DEPEND="
+	dev-libs/grantlee:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qthelp-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-util/astyle-3.1:=
+	kde-apps/libkomparediff2:5
+	>=kde-frameworks/karchive-${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/kcrash-${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/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/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=sys-devel/clang-6.0:=
+	gdbui? ( kde-plasma/libksysguard:5= )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		>=kde-frameworks/krunner-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	dev-util/ninja
+	kde-apps/kapptemplate:5
+	kde-apps/kio-extras:5
+	>=sys-devel/gdb-7.0[python]
+	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
+	!dev-util/kdevelop-clang-tidy
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local clang_version=$(best_version sys-devel/clang)
+	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+
+	local mycmakeargs=(
+		-DLLVM_ROOT=${llvm_root}
+		$(cmake_use_find_package gdbui KSysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+	)
+
+	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "konsole view" kde-apps/konsole
+		optfeature "Static C++ Qt code analysis" dev-util/clazy
+		optfeature "Static C/C++ code analysis" dev-util/cppcheck
+		optfeature "Heap memory profiling" dev-util/heaptrack[qt5]
+		optfeature "Meson Project manager plugin" dev-util/meson
+	fi
+	ecm_pkg_postinst
+}
diff --git a/dev-util/ragel/ragel-7.0.0.12.ebuild b/dev-util/ragel/ragel-7.0.0.12.ebuild
index fd53d7f1912f..fc82dfe8923b 100644
--- a/dev-util/ragel/ragel-7.0.0.12.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="vim-syntax"
 
 DEPEND="~dev-util/colm-0.13.0.7"
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.38.1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
similarity index 88%
rename from dev-util/sysprof-capture/sysprof-capture-3.38.1.ebuild
rename to dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
index c2eafbf121c1..eac804936444 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.38.1.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
@@ -14,8 +14,7 @@ SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.61.3:2
-	!=dev-util/sysprof-3.34.1-r0"
+RDEPEND="!=dev-util/sysprof-3.34.1-r0"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/gdbus-codegen
@@ -32,6 +31,9 @@ multilib_src_configure() {
 		# -Ddebugdir
 		-Dhelp=false
 		-Dlibunwind=false
+		-Denable_tools=false
+		-Denable_tests=false
+		-Denable_examples=false
 	)
 	meson_src_configure
 }
diff --git a/dev-util/ydiff/ydiff-1.2.ebuild b/dev-util/ydiff/ydiff-1.2.ebuild
index d3dfb7dd60a0..0a40380559ec 100644
--- a/dev-util/ydiff/ydiff-1.2.ebuild
+++ b/dev-util/ydiff/ydiff-1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -16,8 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-DEPEND="sys-apps/less"
-RDEPEND=""
+RDEPEND="sys-apps/less"
 
 DOCS=( CHANGES.rst README.rst )
 
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 4e85a3d49999..7734bc876bf3 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/mathematica-fonts/Manifest b/media-fonts/mathematica-fonts/Manifest
deleted file mode 100644
index 5a76ae4e7547..000000000000
--- a/media-fonts/mathematica-fonts/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mathematica-fonts-10.0.zip 586368 BLAKE2B 2be8b7bdd0c663ca0b9e4c1642ed84811adb853c6887d3adcf420d49a386b0a562d75b6cbc09d47ca6bc118703675461087b1c5b6551c55565abd94a64821df2 SHA512 4429163c427bc762cdaf7d310985becff97f78e7b452b184e9cb64f5f787559d283b5438a16f4e6bfaeffe86429bd416d2772707350830f646c70f53b519f4c7
diff --git a/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild b/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild
deleted file mode 100644
index 1055ca7025e0..000000000000
--- a/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit font
-
-DESCRIPTION="Mathematica's Fonts for MathML"
-HOMEPAGE="http://www.wolfram.com/mathematica"
-SRC_URI="http://support.wolfram.com/kb/data/uploads/2014/08/TrueType.zip -> ${P}.zip"
-
-LICENSE="WRI-EULA"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT="binchecks mirror strip"
-
-S="${WORKDIR}"
-FONT_S="${S}"/TrueType
-FONT_SUFFIX="ttf"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 698094a5c5f1..335fbbe93b86 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index 7c9bcc840ba2..bf095c3de1b4 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lupoDharkael/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="FreeArt GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4703f6db5577..d649e72c27a8 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index c338741e2f63..e86f3bf9d4a6 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,3 +1,3 @@
-DIST playerctl-2.0.1.tar.gz 43700 BLAKE2B 9df01bdb5f71a589a40462ed807b0f150d8c90921d1e0ef96bf99f20d9e58345307af35b39cc95e8ab37fcf9e5686935d856e050b61210188008b65281e63557 SHA512 6a5807abc79358bab0ad30a11897a8109121d5eb7d9e17d2c695221ef83942c3c7235fc738ab27c9dd2d3364c04737355e9c88ec5d49f999565565fb4494f720
 DIST playerctl-2.0.2.tar.gz 44241 BLAKE2B 3a1d5f59fdb0067f1147f4ef95990ae0755a372469c0f03491b4f3aec8d0cf754bb4d3057063211ee810532967ace0d35fa6a7f3f8cee8d7a5c09031cb5b11c9 SHA512 ad588f81d42c8000ccd2d2dedacfcd82887a958189b354ad6285545f7ed59e885febe0c3f9e3da915ae0fd0af4bfb4cefda54f17f0560fc4c00b1be6e92f3ac0
 DIST playerctl-2.2.1.tar.gz 66255 BLAKE2B 76732d8074b17ca958b7efe08d7be8d4bce3ba1ec65346a219478b4807c600218e1b8fe971892e7df16ad49273721a5b423bced2bd3441e9f89497375d4e0d84 SHA512 9c08a3f1d5517d7f4270ed92f226453618fc9f0688688d1af9ff55f0c77efeb1b67daa4adc481546215491550f8528095d376ab099c8ddca05235bfb34b36eb7
+DIST playerctl-2.3.1.tar.gz 73595 BLAKE2B d6d60d82fb0a8951fba4a3de91ff1e3f4bdba7177563b65b2da53525af4ca40f42755c577f652aaa24d2de308f56a495c8f87840ad67d6cda840cba1411abdb0 SHA512 06a10d193c83f60a9a9c50dddfb0a74e00be8cde34ddaa9d75582b7ce487ac564d1ff0675f6cb0c27d968e7d435b6a427818ac14e0cdd94b86af8f5d89661a93
diff --git a/media-sound/playerctl/playerctl-2.0.1.ebuild b/media-sound/playerctl/playerctl-2.3.1.ebuild
similarity index 67%
rename from media-sound/playerctl/playerctl-2.0.1.ebuild
rename to media-sound/playerctl/playerctl-2.3.1.ebuild
index 18ed3cb3fc51..8641a7349d5c 100644
--- a/media-sound/playerctl/playerctl-2.0.1.ebuild
+++ b/media-sound/playerctl/playerctl-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit meson xdg-utils
+inherit bash-completion-r1 xdg-utils meson
 
 DESCRIPTION="A CLI utility to control media players over MPRIS"
 HOMEPAGE="https://github.com/acrisci/playerctl"
@@ -12,23 +12,24 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc introspection"
+RESTRICT="test" # Requires dbus-next python package that's not in the tree
 
 RDEPEND="
 	dev-libs/glib:2
 	introspection? ( dev-libs/gobject-introspection:= )
 "
-# Override the meson dependency in MESON_DEPEND of meson.eclass
-# The eclass depends on '>=dev-util/meson-0.40.0' as of writing this
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( dev-util/gtk-doc )
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
-	>=dev-util/meson-0.46.0
-	doc? ( dev-util/gtk-doc )
 	virtual/pkgconfig
 "
 
 src_configure() {
 	local emesonargs=(
+		-Ddatadir=share
+		-Dbindir=bin
 		$(meson_use doc gtk-doc)
 		$(meson_use introspection)
 	)
@@ -39,7 +40,13 @@ src_configure() {
 
 src_install() {
 	meson_src_install
+	rm "${ED}"/usr/$(get_libdir)/libplayerctl.a || die
+
 	docinto examples
 	dodoc -r "${S}"/examples/.
 	docompress -x "/usr/share/doc/${PF}/examples"
+
+	newbashcomp data/playerctl.bash "${PN}"
+	insinto /usr/share/zsh/site-functions
+	newins data/playerctl.zsh _playerctl
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ad48cf59863c..871429eda36a 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 cb383e263282..66a957fc82f1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 08 Dec 2020 13:08:31 +0000
+Wed, 09 Dec 2020 08:08:32 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index cb383e263282..202db303423b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 08 Dec 2020 13:08:31 +0000
+Wed, 09 Dec 2020 08:08:33 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index d77e50c55a16..7f976ede993e 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 2ffd17646481..0348059fe2b5 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/argon2-20190702 b/metadata/md5-cache/app-crypt/argon2-20190702
index 43c992346c5d..57ef3696cbec 100644
--- a/metadata/md5-cache/app-crypt/argon2-20190702
+++ b/metadata/md5-cache/app-crypt/argon2-20190702
@@ -3,9 +3,9 @@ DESCRIPTION=Password hashing software that won the Password Hashing Competition
 EAPI=7
 HOMEPAGE=https://github.com/P-H-C/phc-winner-argon2
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos
 LICENSE=|| ( Apache-2.0 CC0-1.0 )
 SLOT=0/1
 SRC_URI=https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz -> argon2-20190702.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a1e9566b97ebf349479759857c63d7fc
+_md5_=185786f9923a0913b6330f349cd35232
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.24_p8 b/metadata/md5-cache/app-crypt/veracrypt-1.24_p8
new file mode 100644
index 000000000000..1aa3fbceae3b
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.24_p8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup test
+DEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev-libs/pkcs11-helper virtual/pkgconfig asm? ( dev-lang/yasm )
+DESCRIPTION=Disk encryption with strong security based on TrueCrypt
+EAPI=6
+HOMEPAGE=https://www.veracrypt.fr/en/Home.html
+IUSE=+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD truecrypt-3.0
+RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev-libs/pkcs11-helper
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.24-Update8_MacOSX.tar.gz -> veracrypt-1.24_p8.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=3441061b1c1454c8fb1b80c00e4c63e4
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index a25ac550b2f8..6cc112638461 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/libguestfs-1.38.6-r100 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100
new file mode 100644
index 000000000000..c6799aa86297
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6-r100
@@ -0,0 +1,16 @@
+BDEPEND=lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=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 postinst prepare setup
+DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) )
+DESCRIPTION=Tools for accessing, inspect and modifying virtual machine (VM) disk images
+EAPI=7
+HOMEPAGE=https://libguestfs.org/
+IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +lua_single_target_lua5-1 +python_single_target_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_6 ) )
+RESTRICT=!test? ( test )
+SLOT=0/1.38
+SRC_URI=https://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a5de03d850cced8bc39613132b92802a
diff --git a/metadata/md5-cache/app-emulation/libvirt-6.10.0-r1 b/metadata/md5-cache/app-emulation/libvirt-6.10.0-r2
similarity index 99%
rename from metadata/md5-cache/app-emulation/libvirt-6.10.0-r1
rename to metadata/md5-cache/app-emulation/libvirt-6.10.0-r2
index 54513708dbd6..c8f8d49309ac 100644
--- a/metadata/md5-cache/app-emulation/libvirt-6.10.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-6.10.0-r2
@@ -12,4 +12,4 @@ REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtua
 SLOT=0/6.10.0
 SRC_URI=https://libvirt.org/sources/libvirt-6.10.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4124aa275555db2b9a0c9934dedf6e1d
+_md5_=3bc9f9809f8eae80037a245d2c250457
diff --git a/metadata/md5-cache/app-emulation/lxd-4.0.4-r1 b/metadata/md5-cache/app-emulation/lxd-4.0.4-r1
index a6b453368e7b..c8b1f9e2a3c4 100644
--- a/metadata/md5-cache/app-emulation/lxd-4.0.4-r1
+++ b/metadata/md5-cache/app-emulation/lxd-4.0.4-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Fast, dense and secure container management
 EAPI=7
 HOMEPAGE=https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd
 IUSE=apparmor ipv6 nls verify-sig kernel_linux verify-sig
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0
 RDEPEND=app-arch/xz-utils >=app-emulation/lxc-3.0.0[apparmor?,seccomp] dev-libs/dqlite dev-libs/lzo dev-libs/raft net-dns/dnsmasq[dhcp,ipv6?] acct-group/lxd net-firewall/ebtables net-firewall/iptables[ipv6?] sys-apps/iproute2[ipv6?] sys-fs/fuse:0= sys-fs/lxcfs sys-fs/squashfs-tools virtual/acl
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-4.0.4.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxd/lxd-4.0.4.tar.gz.asc )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6c9aa35fc16df43d7142ef2660e00e25	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=a0da2511746954bfb4d9f6616f414cba
+_md5_=20024aa5453ce724f86bc1159fd964c8
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 5c2eef9c7960..7cd97a0a9266 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-bin-6.4.7.2_p1 b/metadata/md5-cache/app-office/libreoffice-bin-6.4.7.2_p1
new file mode 100644
index 000000000000..8009e72e84b5
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.4.7.2_p1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/xdelta:3 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite. Binary package
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=gnome java kde elibc_FreeBSD java +python_single_target_python3_8
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+PDEPEND==app-office/libreoffice-l10n-6.4.7.2*
+RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.74.0 dev-libs/icu:0/67.1 dev-libs/liborcus:0/0.15 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-9.3.0 >=sys-libs/glibc-2.32 virtual/jpeg-compat:62 python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.15 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups sys-apps/dbus[X] gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) dev-db/mariadb-connector-c !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_8 )
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-6.4.7.2_p1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-6.4.7.2_p1.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-6.4.7.2_p1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-java-6.4.7.2_p1.xd3 ) ) ) )
+_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	multilib	d410501a125f99ffb560b0c523cd3d1e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6ec51d338444c581715464deda6150f7
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.7.2_p1 b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.7.2_p1
new file mode 100644
index 000000000000..786bb8387a3a
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.7.2_p1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-util/xdelta:3
+DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=gnome java kde
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=~app-office/libreoffice-bin-6.4.7.2_p1[gnome=,java=,kde=]
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-6.4.7.2_p1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-java-6.4.7.2_p1.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-6.4.7.2_p1.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-6.4.7.2_p1.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-java-6.4.7.2_p1.xd3 ) ) ) )
+_md5_=859a8b259e4a05e4597976275ba5513b
diff --git a/metadata/md5-cache/app-office/libreoffice-voikko-5.0 b/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
similarity index 69%
rename from metadata/md5-cache/app-office/libreoffice-voikko-5.0
rename to metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
index 58c3f2552319..8b53bbb0f7d4 100644
--- a/metadata/md5-cache/app-office/libreoffice-voikko-5.0
+++ b/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
@@ -1,14 +1,14 @@
 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
+DEPEND=|| ( app-office/libreoffice[odk] >=app-office/libreoffice-bin-6.4.7.2_p1 ) 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
+RDEPEND=|| ( app-office/libreoffice[odk] >=app-office/libreoffice-bin-6.4.7.2_p1 ) 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 verify-sig? ( https://www.puimula.org/voikko-sources/libreoffice-voikko/libreoffice-voikko-5.0.tar.gz.asc )
 _eclasses_=verify-sig	40b4f4f782cf67118f594ce604cc4c0a
-_md5_=0413b09524038e295951140115d598a9
+_md5_=771a1e71aecc3d3c90a33cf80a86e3cc
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 8e294c97acfa..05660c5d2bd3 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/po4a-0.57 b/metadata/md5-cache/app-text/po4a-0.57
index 1f3157cfd1bf..96b6c385956f 100644
--- a/metadata/md5-cache/app-text/po4a-0.57
+++ b/metadata/md5-cache/app-text/po4a-0.57
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 virtual/latex-base ) dev-lang/perl
+DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 virtual/latex-base ) dev-lang/perl
 DESCRIPTION=Tools to ease the translation of documentation
 EAPI=7
 HOMEPAGE=https://po4a.org/
 IUSE=test
-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 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
-RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-lang/perl:=
+RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.57/po4a-0.57.tar.gz
 _eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f08e140d48e46c6084e6981b6bc9806a
+_md5_=bdd5290bf7c396e2f76d3565975a1b56
diff --git a/metadata/md5-cache/app-text/po4a-0.60 b/metadata/md5-cache/app-text/po4a-0.61-r1
similarity index 55%
rename from metadata/md5-cache/app-text/po4a-0.60
rename to metadata/md5-cache/app-text/po4a-0.61-r1
index e5719c370223..637ac7abb546 100644
--- a/metadata/md5-cache/app-text/po4a-0.60
+++ b/metadata/md5-cache/app-text/po4a-0.61-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 dev-perl/Test-Pod virtual/latex-base ) dev-lang/perl
+DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 dev-perl/Test-Pod virtual/latex-base ) dev-lang/perl
 DESCRIPTION=Tools to ease the translation of documentation
 EAPI=7
 HOMEPAGE=https://po4a.org/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
-RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-lang/perl:=
+RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.60/po4a-0.60.tar.gz
+SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.61/po4a-0.61.tar.gz
 _eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9c7a7cce34d2af86b87062cd46404a26
+_md5_=f4cd4fed03ab10d213e40d5ea6a7c43b
diff --git a/metadata/md5-cache/app-text/po4a-0.62 b/metadata/md5-cache/app-text/po4a-0.62
new file mode 100644
index 000000000000..7608aaff1c22
--- /dev/null
+++ b/metadata/md5-cache/app-text/po4a-0.62
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-perl/Module-Build test? ( app-text/docbook-sgml-dtd:4.1 dev-perl/Test-Pod virtual/latex-base ) dev-lang/perl
+DESCRIPTION=Tools to ease the translation of documentation
+EAPI=7
+HOMEPAGE=https://po4a.org/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/SGMLSpm dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext virtual/perl-Pod-Parser dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.62/po4a-0.62.tar.gz
+_eclasses_=l10n	8cdd85e169b835d518bc2fd59f780d8e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=f4cd4fed03ab10d213e40d5ea6a7c43b
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 8ade280ea2d0..1fccede22392 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/pgtap-1.1.0 b/metadata/md5-cache/dev-db/pgtap-1.1.0
new file mode 100644
index 000000000000..15bb9e35f28d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgtap-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) app-arch/unzip dev-perl/TAP-Parser-SourceHandler-pgTAP
+DESCRIPTION=Unit testing for PostgreSQL
+EAPI=7
+HOMEPAGE=https://pgtap.org/
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+KEYWORDS=~amd64
+LICENSE=POSTGRESQL
+RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) app-arch/unzip dev-perl/TAP-Parser-SourceHandler-pgTAP
+RESTRICT=test
+SLOT=0
+SRC_URI=https://api.pgxn.org/dist/pgtap/1.1.0/pgtap-1.1.0.zip
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=57ebab1e552aaa1af9864a13d76cf10b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index d051eb5f91c2..c8f686cd4514 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/erlang-23.1.5 b/metadata/md5-cache/dev-lang/erlang-23.1.5
new file mode 100644
index 000000000000..15c7bb4267aa
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/erlang-23.1.5
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
+EAPI=7
+HOMEPAGE=https://www.erlang.org/
+IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/23.1.5
+SRC_URI=https://github.com/erlang/otp/archive/OTP-23.1.5.tar.gz -> erlang-23.1.5.tar.gz http://erlang.org/download/otp_doc_man_23.1.tar.gz -> erlang_doc_man_23.1.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.1.tar.gz -> erlang_doc_html_23.1.tar.gz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=ec3ca69ef421261925723ecb688d37bd
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 667ea195eede..30d3b9af02bf 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/dqlite-1.6.0 b/metadata/md5-cache/dev-libs/dqlite-1.6.0
index 747186e54263..92e57098d899 100644
--- a/metadata/md5-cache/dev-libs/dqlite-1.6.0
+++ b/metadata/md5-cache/dev-libs/dqlite-1.6.0
@@ -5,11 +5,11 @@ DESCRIPTION=Embeddable, replicated and fault tolerant SQL engine
 EAPI=7
 HOMEPAGE=https://github.com/canonical/dqlite
 IUSE=test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=LGPL-3-with-linking-exception
 RDEPEND=dev-db/sqlite:3 dev-libs/libuv dev-libs/raft
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/canonical/dqlite/archive/v1.6.0.tar.gz -> dqlite-1.6.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2abd86d9abc0224f5aee247e84bd852d
+_md5_=1caa9a4e34063a5bbdee3c563826117f
diff --git a/metadata/md5-cache/dev-libs/glib-2.66.3 b/metadata/md5-cache/dev-libs/glib-2.66.3
index bb4a91aa77ea..ded055e340b1 100644
--- a/metadata/md5-cache/dev-libs/glib-2.66.3
+++ b/metadata/md5-cache/dev-libs/glib-2.66.3
@@ -1,6 +1,6 @@
 BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.66.0 >=virtual/libiconv-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(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) !kernel_Winnt? ( virtual/libelf:0= ) fam? ( >=virtual/fam-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(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.38:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=!<dev-util/gdbus-codegen-2.66.3 >=virtual/libiconv-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(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) !kernel_Winnt? ( virtual/libelf:0= ) fam? ( >=virtual/fam-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(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.38:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=The GLib library of C routines
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
@@ -8,9 +8,9 @@ IUSE=dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs s
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.66.0 >=virtual/libiconv-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(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) !kernel_Winnt? ( virtual/libelf:0= ) fam? ( >=virtual/fam-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(-)?] )
+RDEPEND=!<dev-util/gdbus-codegen-2.66.3 >=virtual/libiconv-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(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-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(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) !kernel_Winnt? ( virtual/libelf:0= ) fam? ( >=virtual/fam-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(-)?] )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.66/glib-2.66.3.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31c068d06e88c3dee912421c36d50467
+_md5_=36c1605939431105b4a2356a32df7b31
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
index a85611aa2333..f574d4037c64 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=C++ JSON reader and writer
 EAPI=7
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 IUSE=doc test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris
 LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.4.tar.gz -> jsoncpp-1.9.4.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cc90f78951e1a8aac5f678b38b9c3b6d
+_md5_=a9bea69ca5a0a2109d7d2a45412bb030
diff --git a/metadata/md5-cache/dev-libs/libressl-3.1.5 b/metadata/md5-cache/dev-libs/libressl-3.1.5
new file mode 100644
index 000000000000..bd42be288d0e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libressl-3.1.5
@@ -0,0 +1,17 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dev-libs/openssl:0
+DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
+EAPI=7
+HOMEPAGE=https://www.libressl.org/
+IUSE=+asm static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=ISC openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=!dev-libs/openssl:0
+REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
+SLOT=0/48
+SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.1.5.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=88c742d303a630e74ec0100af8250a13
diff --git a/metadata/md5-cache/dev-libs/libressl-3.2.3 b/metadata/md5-cache/dev-libs/libressl-3.2.3
new file mode 100644
index 000000000000..ef6712eaa0c8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libressl-3.2.3
@@ -0,0 +1,17 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dev-libs/openssl:0
+DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
+EAPI=7
+HOMEPAGE=https://www.libressl.org/
+IUSE=+asm static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=ISC openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=!dev-libs/openssl:0
+REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
+SLOT=0/48
+SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.2.3.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=88c742d303a630e74ec0100af8250a13
diff --git a/metadata/md5-cache/dev-libs/libressl-3.3.1 b/metadata/md5-cache/dev-libs/libressl-3.3.1
new file mode 100644
index 000000000000..fec6cda0c471
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libressl-3.3.1
@@ -0,0 +1,17 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dev-libs/openssl:0
+DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
+EAPI=7
+HOMEPAGE=https://www.libressl.org/
+IUSE=+asm static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=ISC openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=!dev-libs/openssl:0
+REQUIRED_USE=test? ( static-libs )
+RESTRICT=!test? ( test )
+SLOT=0/48
+SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.3.1.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5aa377951afe6a37867e2f791d263b25
diff --git a/metadata/md5-cache/dev-libs/libucl-0.8.1-r100 b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
new file mode 100644
index 000000000000..5fc78352a3b1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libucl-0.8.1-r100
@@ -0,0 +1,16 @@
+BDEPEND=!!dev-libs/ucl lua? ( 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 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=!!dev-libs/ucl lua? ( 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 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 )
+DESCRIPTION=Universal configuration library parser
+EAPI=7
+HOMEPAGE=https://github.com/vstakhov/libucl
+IUSE=lua +regex sign urls +utils static-libs test lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=!!dev-libs/ucl lua? ( 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 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 )
+REQUIRED_USE=lua? ( ^^ ( 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/vstakhov/libucl/archive/0.8.1.tar.gz -> libucl-0.8.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=23f7ad8441b86b7bbbc869123b90c0e3
diff --git a/metadata/md5-cache/dev-libs/libucl-9999 b/metadata/md5-cache/dev-libs/libucl-9999
index 68793c97d005..2330d20522c1 100644
--- a/metadata/md5-cache/dev-libs/libucl-9999
+++ b/metadata/md5-cache/dev-libs/libucl-9999
@@ -1,13 +1,15 @@
-BDEPEND=!!dev-libs/ucl lua? ( >=dev-lang/lua-5.1:= ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=!!dev-libs/ucl lua? ( >=dev-lang/lua-5.1:= ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 )
+BDEPEND=!!dev-libs/ucl lua? ( 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 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install prepare setup test unpack
+DEPEND=!!dev-libs/ucl lua? ( 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 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 )
 DESCRIPTION=Universal configuration library parser
 EAPI=7
 HOMEPAGE=https://github.com/vstakhov/libucl
-IUSE=lua +regex sign urls +utils static-libs
+IUSE=lua +regex sign urls +utils static-libs test lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
 LICENSE=BSD-2
 PROPERTIES=live
-RDEPEND=!!dev-libs/ucl lua? ( >=dev-lang/lua-5.1:= ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 )
+RDEPEND=!!dev-libs/ucl lua? ( 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 ) ) urls? ( net-misc/curl ) sign? ( dev-libs/openssl:0 )
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 ) )
+RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=278fd14ac9dd43e0d6d95ba20417097e
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=23f7ad8441b86b7bbbc869123b90c0e3
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1i b/metadata/md5-cache/dev-libs/openssl-1.1.1i
new file mode 100644
index 000000000000..f423869a4c93
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1i
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils sys-devel/bc sys-process/procps )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=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(-)?] )
+DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
+EAPI=7
+HOMEPAGE=https://www.openssl.org/
+IUSE=+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=openssl
+PDEPEND=app-misc/ca-certificates
+RDEPEND=>=app-misc/c_rehash-1.7-r1 zlib? ( >=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(-)?] ) !<net-misc/openssh-8.0_p1-r3
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=0/1.1
+SRC_URI=mirror://openssl/source/openssl-1.1.1i.tar.gz bindist? ( mirror://gentoo/openssl-1.1.1i-bindist-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.1.1i-bindist-1.0.tar.xz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7f3556a5af9f57b3b4f4dc24ae2f2557
diff --git a/metadata/md5-cache/dev-libs/raft-0.9.25 b/metadata/md5-cache/dev-libs/raft-0.9.25
index c4885a0feb99..0988958b0793 100644
--- a/metadata/md5-cache/dev-libs/raft-0.9.25
+++ b/metadata/md5-cache/dev-libs/raft-0.9.25
@@ -5,11 +5,11 @@ DESCRIPTION=C implementation of the Raft consensus protocol
 EAPI=7
 HOMEPAGE=https://github.com/canonical/raft
 IUSE=test
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=LGPL-3-with-linking-exception
 RDEPEND=dev-libs/libuv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/canonical/raft/archive/v0.9.25.tar.gz -> raft-0.9.25.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=18b7da7a46478124754aa7da9516ee0c
+_md5_=4c512ce2d52b473573bab1ac16ebe7ff
diff --git a/metadata/md5-cache/dev-libs/re2-0.2020.08.01 b/metadata/md5-cache/dev-libs/re2-0.2020.08.01
deleted file mode 100644
index 3676c1e9e7b3..000000000000
--- a/metadata/md5-cache/dev-libs/re2-0.2020.08.01
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=icu? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=An efficient, principled regular expression library
-EAPI=7
-HOMEPAGE=https://github.com/google/re2
-IUSE=icu 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 ~s390 ~sparc x86
-LICENSE=BSD
-RDEPEND=icu? ( dev-libs/icu: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(-)?] )
-SLOT=0/8
-SRC_URI=https://github.com/google/re2/archive/2020-08-01.tar.gz -> re2-2020-08-01.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=53a77f769d34d5ab9cc6c9b0599cab7d
diff --git a/metadata/md5-cache/dev-libs/re2-0.2020.10.01 b/metadata/md5-cache/dev-libs/re2-0.2020.10.01
deleted file mode 100644
index e47c9a446396..000000000000
--- a/metadata/md5-cache/dev-libs/re2-0.2020.10.01
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=icu? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=An efficient, principled regular expression library
-EAPI=7
-HOMEPAGE=https://github.com/google/re2
-IUSE=icu 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 ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=icu? ( dev-libs/icu: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(-)?] )
-SLOT=0/8
-SRC_URI=https://github.com/google/re2/archive/2020-10-01.tar.gz -> re2-2020-10-01.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0333f0a0476f581395ddb724cb300eda
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index f3fb5c3918c4..bf7c78ae54c4 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.19 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.19
index 7f05891eb4a7..4b019d43516b 100644
--- a/metadata/md5-cache/dev-php/pecl-apcu-5.1.19
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.19
@@ -1,15 +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 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+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 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+DEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=Stripped down version of APC supporting only user cache
 EAPI=7
 HOMEPAGE=https://pecl.php.net/apcu
-IUSE=+mmap lock-pthreadmutex +lock-pthreadrw lock-spinlock lock-semaphore php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
+IUSE=+mmap lock-pthreadmutex +lock-pthreadrw lock-spinlock lock-semaphore php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=^^ ( lock-pthreadmutex lock-pthreadrw lock-spinlock lock-semaphore ) || ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
+RDEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=^^ ( lock-pthreadmutex lock-pthreadrw lock-spinlock lock-semaphore ) || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/apcu-5.1.19.tgz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5f5d662dd58073f03d245ffb71f88c78
+_md5_=26e08ea5d4fb6c9d5312dcc2c28c08d7
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-3.1.1 b/metadata/md5-cache/dev-php/pecl-mailparse-3.1.1
index a787ac253bb7..4ca187fd38b6 100644
--- a/metadata/md5-cache/dev-php/pecl-mailparse-3.1.1
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-3.1.1
@@ -1,15 +1,15 @@
-BDEPEND=>=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] )
+BDEPEND=>=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] ) php_targets_php8-0? ( dev-lang/php:8.0[unicode] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] )
+DEPEND=php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] ) php_targets_php8-0? ( dev-lang/php:8.0[unicode] )
 DESCRIPTION=PHP extension for parsing and working with RFC822 and MIME compliant messages
 EAPI=7
 HOMEPAGE=https://pecl.php.net/mailparse
-IUSE=php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
+IUSE=php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] )
-REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
+RDEPEND=php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php7-3? ( dev-lang/php:7.3[unicode] ) php_targets_php7-4? ( dev-lang/php:7.4[unicode] ) php_targets_php8-0? ( dev-lang/php:8.0[unicode] )
+REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/mailparse-3.1.1.tgz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ad506063b83f69b820fd32b1ce59a57a
+_md5_=660f61bf33a29d3563878011b687ba96
diff --git a/metadata/md5-cache/dev-php/pecl-oauth-2.0.7 b/metadata/md5-cache/dev-php/pecl-oauth-2.0.7
index 00ba76b87ed1..8269ff002d70 100644
--- a/metadata/md5-cache/dev-php/pecl-oauth-2.0.7
+++ b/metadata/md5-cache/dev-php/pecl-oauth-2.0.7
@@ -1,15 +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 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+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 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-2? ( dev-lang/php:7.2[hash(-)] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-3? ( dev-lang/php:7.3[hash(-)] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-4? ( dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+DEPEND=dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) php_targets_php7-2? ( dev-lang/php:7.2[hash(-)] ) php_targets_php7-3? ( dev-lang/php:7.3[hash(-)] ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=OAuth is an authorization protocol built on top of HTTP
 EAPI=7
 HOMEPAGE=https://pecl.php.net/oauth
-IUSE=+curl examples php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
+IUSE=+curl examples php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=php_targets_php7-2? ( dev-lang/php:7.2[hash(-)] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-3? ( dev-lang/php:7.3[hash(-)] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-4? ( dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
+RDEPEND=dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) php_targets_php7-2? ( dev-lang/php:7.2[hash(-)] ) php_targets_php7-3? ( dev-lang/php:7.3[hash(-)] ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/oauth-2.0.7.tgz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2092894735132c6aeda8ef46aae5b146
+_md5_=8df890794e9ad71a591268f0e6f1ae89
diff --git a/metadata/md5-cache/dev-php/pecl-timezonedb-2020.4 b/metadata/md5-cache/dev-php/pecl-timezonedb-2020.4
new file mode 100644
index 000000000000..f5373636025c
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-timezonedb-2020.4
@@ -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 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=Timezone Database to be used with PHP's date and time functions
+EAPI=7
+HOMEPAGE=https://pecl.php.net/timezonedb
+IUSE=php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=PHP-3
+RDEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/timezonedb-2020.4.tgz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b5ffd9aecc4d5337e1d9b20d4677ef3f
diff --git a/metadata/md5-cache/dev-php/pecl-translit-0.7.1 b/metadata/md5-cache/dev-php/pecl-translit-0.7.1
new file mode 100644
index 000000000000..f821662bc16d
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-translit-0.7.1
@@ -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 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DESCRIPTION=Transliterates non-latin character sets to latin
+EAPI=7
+HOMEPAGE=https://github.com/derickr/pecl-translit
+IUSE=php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+SLOT=0
+SRC_URI=https://github.com/derickr/pecl-translit/archive/0.7.1.tar.gz -> pecl-translit-0.7.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8b9bedfee3ceb18d38f0334df8d21171
diff --git a/metadata/md5-cache/dev-php/pecl-uuid-1.2.0 b/metadata/md5-cache/dev-php/pecl-uuid-1.2.0
index fad5e87e76b5..9068c91f00f1 100644
--- a/metadata/md5-cache/dev-php/pecl-uuid-1.2.0
+++ b/metadata/md5-cache/dev-php/pecl-uuid-1.2.0
@@ -1,15 +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 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+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 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/util-linux php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+DEPEND=sys-apps/util-linux php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=A wrapper around libuuid
 EAPI=7
 HOMEPAGE=https://pecl.php.net/uuid
-IUSE=php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
+IUSE=php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/util-linux php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
+RDEPEND=sys-apps/util-linux php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/uuid-1.2.0.tgz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=623e005129b32c6734ffeeb81e401c24
+_md5_=e5f1b2b83c2122cbac569c36d0b4dc7e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 74686bcaaa8a..99742dab429a 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/feedparser-5.2.1-r1 b/metadata/md5-cache/dev-python/feedparser-5.2.1-r1
new file mode 100644
index 000000000000..2193e17d8323
--- /dev/null
+++ b/metadata/md5-cache/dev-python/feedparser-5.2.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Parse RSS and Atom feeds in Python
+EAPI=7
+HOMEPAGE=https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/
+IUSE=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 ~x86-solaris
+LICENSE=BSD-2 PSF-2
+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
+SLOT=0
+SRC_URI=mirror://pypi/f/feedparser/feedparser-5.2.1.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b614b85ade4c20f6d93aa56bdd721263
diff --git a/metadata/md5-cache/dev-python/mock-4.0.2 b/metadata/md5-cache/dev-python/mock-4.0.2
index e8e000cbc5ac..d48241ba842b 100644
--- a/metadata/md5-cache/dev-python/mock-4.0.2
+++ b/metadata/md5-cache/dev-python/mock-4.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=Rolling backport of unittest.mock for all Pythons
 EAPI=7
 HOMEPAGE=https://github.com/testing-cabal/mock
 IUSE=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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.9[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 )
 SLOT=0
 SRC_URI=https://github.com/testing-cabal/mock/archive/4.0.2.tar.gz -> mock-4.0.2.gh.tar.gz
 _eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=caaba9c81b1f1b571ddf3effc5501ef5
+_md5_=f878565c4b1feb81cf6d26f23d623dba
diff --git a/metadata/md5-cache/dev-python/parameterized-0.7.4 b/metadata/md5-cache/dev-python/parameterized-0.7.4
index a884c9ccedcb..219e34bc1e85 100644
--- a/metadata/md5-cache/dev-python/parameterized-0.7.4
+++ b/metadata/md5-cache/dev-python/parameterized-0.7.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Parameterized testing with any Python test framework
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/parameterized/parameterized-0.7.4.tar.gz
 _eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d82bdb2209b9cb45f8d90d5db8c80da3
+_md5_=33cada5d5f85434f925883be80e7ed7d
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 80abf8977457..6e650f6b4fcc 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/cmdparse-3.0.7 b/metadata/md5-cache/dev-ruby/cmdparse-3.0.7
new file mode 100644
index 000000000000..a8ca735b1b6b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/cmdparse-3.0.7
@@ -0,0 +1,16 @@
+BDEPEND=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(-)] !!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=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=Advanced command line parser supporting commands
+EAPI=7
+HOMEPAGE=https://cmdparse.gettalong.org/
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/cmdparse-3.0.7.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=665cc636b8945097714b47fe8237ed54
diff --git a/metadata/md5-cache/dev-ruby/tty-reader-0.9.0 b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
new file mode 100644
index 000000000000..df6b261f816a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tty-reader-0.9.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby25(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby25(-)] =dev-ruby/wisper-2*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby26(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby26(-)] =dev-ruby/wisper-2*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby27(-)] =dev-ruby/wisper-2*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_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=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=Methods for processing keyboard input in character, line and multiline modes
+EAPI=7
+HOMEPAGE=https://github.com/piotrmurach/tty-reader
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby25(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby25(-)] =dev-ruby/wisper-2*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby26(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby26(-)] =dev-ruby/wisper-2*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/tty-cursor-0.7:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-screen-0.8:0[ruby_targets_ruby27(-)] =dev-ruby/wisper-2*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/piotrmurach/tty-reader/archive/v0.9.0.tar.gz -> tty-reader-0.9.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	927b40774937983813d360c726615e54	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5a43131df1c0af94672d67f4e020dbb9
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 82b73f97be41..9f154e32e7f4 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/gnome-builder-3.38.1 b/metadata/md5-cache/dev-util/gnome-builder-3.38.1
new file mode 100644
index 000000000000..5f6c88014e18
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.38.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=dev-util/meson-0.49.2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/libdazzle-3.37.0[introspection] >=dev-libs/glib-2.65.0:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.19.91 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-libs/template-glib-3.28.0[introspection] >=x11-libs/vte-0.40.2:2.91[introspection] >=net-libs/webkit-gtk-2.26:4=[introspection] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-0.28.0.1[ssh] ) dev-libs/libpcre:3 dev-libs/libpcre2 >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_6? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[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] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10= ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 ) sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An IDE for writing GNOME-based software
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Builder
+IUSE=clang +devhelp doc +git +glade gtk-doc spell sysprof test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
+RDEPEND=>=dev-libs/libdazzle-3.37.0[introspection] >=dev-libs/glib-2.65.0:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.19.91 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-libs/template-glib-3.28.0[introspection] >=x11-libs/vte-0.40.2:2.91[introspection] >=net-libs/webkit-gtk-2.26:4=[introspection] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-0.28.0.1[ssh] ) dev-libs/libpcre:3 dev-libs/libpcre2 >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_6? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[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] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10= ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 ) sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-builder/3.38/gnome-builder-3.38.1.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a7ceed912322577301955c05d0bee605
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2019.11.30 b/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
index fe5276235ba8..c177287fce87 100644
--- a/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
+++ b/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
@@ -1,15 +1,14 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=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[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=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=python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=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=Converts profiling output to dot graphs
 EAPI=7
 HOMEPAGE=https://github.com/jrfonseca/gprof2dot
-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 ~x86
 LICENSE=LGPL-3+
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=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(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=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 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=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=mirror://pypi/g/gprof2dot/gprof2dot-2019.11.30.tar.gz
 _eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6fb4fb3ec0ed54954b7de8e45ef47363
+_md5_=1667177c784d4866ea23f1f9ea8ee0c0
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r2 b/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r3
similarity index 98%
rename from metadata/md5-cache/dev-util/gtk-doc-1.33.1-r2
rename to metadata/md5-cache/dev-util/gtk-doc-1.33.1-r3
index 68fe3ca38424..29b9c6d5d4d7 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r2
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.33.1-r3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.33/gtk-doc-1.33.1.tar.xz
 _eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=13205b6723a7ab53aaea9cd170bcd875
+_md5_=27f19bbecd4919c71e610ad4a59ac08a
diff --git a/metadata/md5-cache/dev-util/hermes-2.8 b/metadata/md5-cache/dev-util/hermes-2.8
new file mode 100644
index 000000000000..6cd3c484e4d1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/hermes-2.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup test
+DESCRIPTION=Lua based testing manager
+EAPI=7
+HOMEPAGE=https://github.com/TACC/Hermes
+IUSE=test lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=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 ) lua_single_target_lua5-1? ( dev-lua/luaposix[lua_targets_lua5-1(-)] ) lua_single_target_lua5-2? ( dev-lua/luaposix[lua_targets_lua5-2(-)] ) lua_single_target_lua5-3? ( dev-lua/luaposix[lua_targets_lua5-3(-)] )
+REQUIRED_USE=^^ ( 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/TACC/Hermes/archive/2.8.tar.gz -> hermes-2.8.tar.gz
+_eclasses_=lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9ab0f5927b10123ba394d283addefcf8
diff --git a/metadata/md5-cache/dev-util/idea-community-2020.2.4.202.8194.7 b/metadata/md5-cache/dev-util/idea-community-2020.2.4.202.8194.7
deleted file mode 100644
index 01d41d89d29a..000000000000
--- a/metadata/md5-cache/dev-util/idea-community-2020.2.4.202.8194.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15
-DESCRIPTION=A complete toolset for web, mobile and enterprise development
-EAPI=7
-HOMEPAGE=https://www.jetbrains.com/idea
-IUSE=+jbr8 -jbr11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 ) jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
-RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 >=virtual/jdk-1.7:* dev-java/jansi-native dev-libs/libdbusmenu =dev-util/lldb-9*
-REQUIRED_USE=jbr8? ( !jbr11 )
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2020.2.4-no-jbr.tar.gz -> ideaIC-2.4.202.8194.7.tar.gz jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-8u202-linux-i586-b1483.37.tar.gz -> jbrx-8u202-linux-i586-b1483.37.tar.gz ) amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-8u202-linux-x64-b1483.37.tar.gz -> jbrx-8u202-linux-x64-b1483.37.tar.gz ) ) jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-11_0_2-linux-x64-b164.tar.gz -> jbr-11_0_2-linux-x64-b164.tar.gz ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=05442bd3ae88bffa45105c0c809d4f93
diff --git a/metadata/md5-cache/dev-util/idea-community-2020.3.0.203.5981.155 b/metadata/md5-cache/dev-util/idea-community-2020.3.0.203.5981.155-r1
similarity index 96%
rename from metadata/md5-cache/dev-util/idea-community-2020.3.0.203.5981.155
rename to metadata/md5-cache/dev-util/idea-community-2020.3.0.203.5981.155-r1
index 80e949238f26..26e7a2aecbee 100644
--- a/metadata/md5-cache/dev-util/idea-community-2020.3.0.203.5981.155
+++ b/metadata/md5-cache/dev-util/idea-community-2020.3.0.203.5981.155-r1
@@ -6,9 +6,9 @@ EAPI=7
 HOMEPAGE=https://www.jetbrains.com/idea
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
-RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) >=virtual/jdk-1.7:* dev-java/jansi-native dev-libs/libdbusmenu =dev-util/lldb-9*
+RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) >=virtual/jdk-1.7:* dev-java/jansi-native dev-libs/libdbusmenu =dev-util/lldb-10*
 RESTRICT=splitdebug
 SLOT=0
 SRC_URI=https://download.jetbrains.com/idea/ideaIC-2020.3-no-jbr.tar.gz -> ideaIC-3.0.203.5981.155.tar.gz amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-11_0_8-linux-x64-b1098.1.tar.gz -> jbr-11_0_8-linux-x64-b1098.1.tar.gz )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f35ae6e455579544ea7d215b3fb28c14
+_md5_=e541e862c2cae7d0d1a87369dd9a8122
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.6.1 b/metadata/md5-cache/dev-util/kdevelop-5.6.1
new file mode 100644
index 000000000000..b75a97738139
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-5.6.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( 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/grantlee:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qthelp-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qttest-5.15.1:5 >=dev-qt/qtwebengine-5.15.1:5[widgets] >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=dev-util/astyle-3.1:= kde-apps/libkomparediff2:5 >=kde-frameworks/karchive-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/kcrash-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/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/kservice-5.74.0:5 >=kde-frameworks/ktexteditor-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 >=kde-frameworks/sonnet-5.74.0:5 >=kde-frameworks/threadweaver-5.74.0:5 >=sys-devel/clang-6.0:= gdbui? ( kde-plasma/libksysguard:5= ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.74.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) dev-libs/boost >=dev-qt/qtconcurrent-5.15.1:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Integrated Development Environment, supporting KF5/Qt, C/C++ and much more
+EAPI=7
+HOMEPAGE=https://kdevelop.org/
+IUSE=+gdbui hex +plasma +qmake reviewboard subversion test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.1:5 >=dev-qt/qtdeclarative-5.15.1:5[widgets] >=dev-qt/qtgui-5.15.1:5 >=dev-qt/qthelp-5.15.1:5 >=dev-qt/qtnetwork-5.15.1:5 >=dev-qt/qttest-5.15.1:5 >=dev-qt/qtwebengine-5.15.1:5[widgets] >=dev-qt/qtwidgets-5.15.1:5 >=dev-qt/qtxml-5.15.1:5 >=dev-util/astyle-3.1:= kde-apps/libkomparediff2:5 >=kde-frameworks/karchive-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/kcrash-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/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/kservice-5.74.0:5 >=kde-frameworks/ktexteditor-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 >=kde-frameworks/sonnet-5.74.0:5 >=kde-frameworks/threadweaver-5.74.0:5 >=sys-devel/clang-6.0:= gdbui? ( kde-plasma/libksysguard:5= ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.74.0:5 >=kde-frameworks/plasma-5.74.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.74.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) >=dev-qt/qdbus-5.15.1:5 >=dev-qt/qtquickcontrols-5.15.1:5 >=dev-qt/qtquickcontrols2-5.15.1:5 dev-util/ninja kde-apps/kapptemplate:5 kde-apps/kio-extras:5 >=sys-devel/gdb-7.0[python] reviewboard? ( kde-apps/ktp-accounts-kcm:5 ) !dev-util/kdevelop-clang-tidy || ( 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/56
+SRC_URI=mirror://kde/stable/kdevelop/5.6.1/src/kdevelop-5.6.1.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=146961bcd2fbda33025d457f3af66b38
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.6.1 b/metadata/md5-cache/dev-util/kdevelop-php-5.6.1
new file mode 100644
index 000000000000..3b1ae9d45072
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.6.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-util/kdevelop:5[test] ) dev-util/ninja dev-util/cmake test? ( 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/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop: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/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/threadweaver-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=PHP plugin for KDevelop
+EAPI=7
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=dev-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop: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/ki18n-5.74.0:5 >=kde-frameworks/kio-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/threadweaver-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/kdevelop/5.6.1/src/kdev-php-5.6.1.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2a4abc9e99c821e74e8b340722a5ecd2
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.6.1 b/metadata/md5-cache/dev-util/kdevelop-python-5.6.1
new file mode 100644
index 000000000000..617fee561aa8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.6.1
@@ -0,0 +1,16 @@
+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=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-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 dev-util/kdevelop:5= >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-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/kitemmodels-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/threadweaver-5.74.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Python plugin for KDevelop
+EAPI=7
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=debug test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+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-qt/qtgui-5.15.1:5 >=dev-qt/qtwidgets-5.15.1:5 dev-util/kdevelop:5= >=kde-frameworks/kcompletion-5.74.0:5 >=kde-frameworks/kconfig-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/kitemmodels-5.74.0:5 >=kde-frameworks/knewstuff-5.74.0:5 >=kde-frameworks/kparts-5.74.0:5 >=kde-frameworks/ktexteditor-5.74.0:5 >=kde-frameworks/kwidgetsaddons-5.74.0:5 >=kde-frameworks/kxmlgui-5.74.0:5 >=kde-frameworks/threadweaver-5.74.0:5 python_single_target_python3_7? ( dev-python/pycodestyle[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycodestyle[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycodestyle[python_targets_python3_9(-)] ) || ( 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 )
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.6.1/src/kdev-python-5.6.1.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	16ab706e1b049cfaa65425a0c0e28cac	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ca96154cea830b2b1fef8d109dd1bc27
diff --git a/metadata/md5-cache/dev-util/ragel-7.0.0.12 b/metadata/md5-cache/dev-util/ragel-7.0.0.12
index cf4a5f33d7f7..60cc6b0227bd 100644
--- a/metadata/md5-cache/dev-util/ragel-7.0.0.12
+++ b/metadata/md5-cache/dev-util/ragel-7.0.0.12
@@ -5,10 +5,10 @@ DESCRIPTION=Compiles finite state machines from regular languages into executabl
 EAPI=7
 HOMEPAGE=https://www.colm.net/open-source/ragel/
 IUSE=vim-syntax
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=~dev-util/colm-0.13.0.7
 SLOT=0
 SRC_URI=https://www.colm.net/files/ragel/ragel-7.0.0.12.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3c344eaaf7b64635bd3c9818baccefd1
+_md5_=4b962330fadbaf901df461b563e64795
diff --git a/metadata/md5-cache/dev-util/sysprof-capture-3.38.1 b/metadata/md5-cache/dev-util/sysprof-capture-3.38.1-r1
similarity index 86%
rename from metadata/md5-cache/dev-util/sysprof-capture-3.38.1
rename to metadata/md5-cache/dev-util/sysprof-capture-3.38.1-r1
index 7dbddbbf4855..b2f1b709d30c 100644
--- a/metadata/md5-cache/dev-util/sysprof-capture-3.38.1
+++ b/metadata/md5-cache/dev-util/sysprof-capture-3.38.1-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/gdbus-codegen >=sys-kernel/linux-headers-2.6.32 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
 DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.61.3:2 !=dev-util/sysprof-3.34.1-r0
+DEPEND=!=dev-util/sysprof-3.34.1-r0
 DESCRIPTION=Static library for sysprof capture data generation
 EAPI=7
 HOMEPAGE=http://sysprof.com/
 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 ~x86
 LICENSE=GPL-3+ GPL-2+
-RDEPEND=>=dev-libs/glib-2.61.3:2 !=dev-util/sysprof-3.34.1-r0
+RDEPEND=!=dev-util/sysprof-3.34.1-r0
 SLOT=4
 SRC_URI=mirror://gnome/sources/sysprof/3.38/sysprof-3.38.1.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d73d52d2c7519518439a8879a38c3074
+_md5_=3323932d15af5592d164853c224f1735
diff --git a/metadata/md5-cache/dev-util/ydiff-1.2 b/metadata/md5-cache/dev-util/ydiff-1.2
index d41386779225..a1d679bc5477 100644
--- a/metadata/md5-cache/dev-util/ydiff-1.2
+++ b/metadata/md5-cache/dev-util/ydiff-1.2
@@ -1,16 +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=sys-apps/less
 DESCRIPTION=Colored, side-by-side diff terminal viewer (ex. cdiff)
 EAPI=7
 HOMEPAGE=https://github.com/ymattw/ydiff
-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 ~x86 ~amd64-linux ~x86-linux
 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=sys-apps/less 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
 SLOT=0
 SRC_URI=mirror://pypi/y/ydiff/ydiff-1.2.tar.gz
 _eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=059f60475aa7f16a5cd07d772ac50757
+_md5_=85e8be6c9330af374c32c883b5381e41
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 599d9c977d8c..01ec765c21ce 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/mathematica-fonts-10.0 b/metadata/md5-cache/media-fonts/mathematica-fonts-10.0
deleted file mode 100644
index dfd1d6f6fe11..000000000000
--- a/metadata/md5-cache/media-fonts/mathematica-fonts-10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Mathematica's Fonts for MathML
-EAPI=5
-HOMEPAGE=http://www.wolfram.com/mathematica
-IUSE=X
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=WRI-EULA
-RESTRICT=binchecks mirror strip
-SLOT=0
-SRC_URI=http://support.wolfram.com/kb/data/uploads/2014/08/TrueType.zip -> mathematica-fonts-10.0.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dd8148fc87a75099c7fd7f3799eb0f03
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index f89d16f70755..85fa3f988db9 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/flameshot-0.6.0 b/metadata/md5-cache/media-gfx/flameshot-0.6.0
index ce6dfc76a502..3b691e1436a4 100644
--- a/metadata/md5-cache/media-gfx/flameshot-0.6.0
+++ b/metadata/md5-cache/media-gfx/flameshot-0.6.0
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-q
 DESCRIPTION=Powerful yet simple to use screenshot software
 EAPI=7
 HOMEPAGE=https://flameshot.js.org
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=FreeArt GPL-3 Apache-2.0
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 sys-apps/dbus
 SLOT=0
 SRC_URI=https://github.com/lupoDharkael/flameshot/archive/v0.6.0.tar.gz -> flameshot-0.6.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	d410501a125f99ffb560b0c523cd3d1e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc4f41ff36b7398ec4c9746b0aff9326
+_md5_=0b48a6e35e61d2076719c8dc551d376d
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index cbf7081a72e4..52036b12d598 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/playerctl-2.0.1 b/metadata/md5-cache/media-sound/playerctl-2.0.1
deleted file mode 100644
index 2f04e132216a..000000000000
--- a/metadata/md5-cache/media-sound/playerctl-2.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= ) dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/meson-0.46.0 doc? ( dev-util/gtk-doc ) virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DESCRIPTION=A CLI utility to control media players over MPRIS
-EAPI=6
-HOMEPAGE=https://github.com/acrisci/playerctl
-IUSE=doc introspection
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
-SLOT=0
-SRC_URI=https://github.com/acrisci/playerctl/archive/v2.0.1.tar.gz -> playerctl-2.0.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b26bc5cb5235a9faa1bd31a6bf0d627c
diff --git a/metadata/md5-cache/media-sound/playerctl-2.3.1 b/metadata/md5-cache/media-sound/playerctl-2.3.1
new file mode 100644
index 000000000000..3fa46eeaa1dd
--- /dev/null
+++ b/metadata/md5-cache/media-sound/playerctl-2.3.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-util/gtk-doc ) dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
+DESCRIPTION=A CLI utility to control media players over MPRIS
+EAPI=7
+HOMEPAGE=https://github.com/acrisci/playerctl
+IUSE=doc introspection
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 introspection? ( dev-libs/gobject-introspection:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/acrisci/playerctl/archive/v2.3.1.tar.gz -> playerctl-2.3.1.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4389da0e4d57f059673bfb6153fa5e0
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 311284e90d5b..5eafc0d69972 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/rrdtool-1.7.2-r100 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
index fb2f13670bef..d044258a76e7 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	6492ae184ebb9d8124e5e0b23db93433	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	lua	117840f7c4855d27ccde1c6cca990331	lua-utils	661d14f97b7d04273143565853fdfbfe	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=473757352d96dcf07e5d0fbdf8b4cece
+_md5_=1dc4c23580776f795681ad449600a3c7
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.16-r100 b/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
new file mode 100644
index 000000000000..ec30610c28ec
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
@@ -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 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 dev-libs/libdnet net-libs/libnsl:0= sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) open-appid? ( lua_single_target_luajit? ( dev-lang/luajit:= ) )
+DESCRIPTION=The de facto standard for intrusion detection/prevention
+EAPI=7
+HOMEPAGE=https://www.snort.org
+IUSE=+active-response control-socket debug file-inspect +flexresp3 +gre high-availability inline-init-failopen large-pcap-64bit +libtirpc linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react reload-error-restart selinux shared-rep side-channel sourcefire static +threads +lua_single_target_luajit
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 dev-libs/libdnet net-libs/libnsl:0= sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) open-appid? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) selinux? ( sec-policy/selinux-snort ) virtual/tmpfiles
+REQUIRED_USE=!kernel_linux? ( !shared-rep ) open-appid? ( ^^ ( lua_single_target_luajit ) )
+SLOT=0
+SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.16.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	661d14f97b7d04273143565853fdfbfe	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=78144d167debaeeaf7f90a589b2f72d5
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index fb5790af6caf..fd43a6fa5a93 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/valtz-0.7-r3 b/metadata/md5-cache/net-dns/valtz-0.7-r3
deleted file mode 100644
index 54b03f979c03..000000000000
--- a/metadata/md5-cache/net-dns/valtz-0.7-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Validation tool for tinydns-data zone files
-EAPI=7
-HOMEPAGE=https://x42.com/software/valtz/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=https://x42.com/software/valtz/valtz.tgz -> valtz-0.7.tgz
-_md5_=971ec1bb340fe36aa0f1a33b142a7cd9
diff --git a/metadata/md5-cache/net-dns/valtz-0.8 b/metadata/md5-cache/net-dns/valtz-0.8
index 227c8be07a5f..4c281d6a52d6 100644
--- a/metadata/md5-cache/net-dns/valtz-0.8
+++ b/metadata/md5-cache/net-dns/valtz-0.8
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Validation tool for tinydns-data zone files
 EAPI=7
 HOMEPAGE=http://michael.orlitzky.com/code/valtz.xhtml
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/valtz-0.8.tar.xz
-_md5_=61f158c71670f4b6e5631bce3363334b
+_md5_=1278fc6a79858292a6a45aecbaaa1f1c
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index dfe89f2b3885..adeb091ecdd1 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/element-desktop-bin-1.7.14 b/metadata/md5-cache/net-im/element-desktop-bin-1.7.15
similarity index 97%
rename from metadata/md5-cache/net-im/element-desktop-bin-1.7.14
rename to metadata/md5-cache/net-im/element-desktop-bin-1.7.15
index 83ee54667b02..b87d41d022bd 100644
--- a/metadata/md5-cache/net-im/element-desktop-bin-1.7.14
+++ b/metadata/md5-cache/net-im/element-desktop-bin-1.7.15
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=app-accessibility/at-spi2-atk:2 app-crypt/libsecret dev-db/sqlcipher dev-libs/atk dev-libs/expat dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango emoji? ( media-fonts/noto-emoji )
 SLOT=0
-SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.7.14_amd64.deb
+SRC_URI=https://packages.riot.im/debian/pool/main/e/element-desktop/element-desktop_1.7.15_amd64.deb
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a29792e33c256da17c80908e634f618
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 6e13ad713138..7db463669f6f 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/rss2email-3.11 b/metadata/md5-cache/net-mail/rss2email-3.11
deleted file mode 100644
index 0e2fb4dbc01b..000000000000
--- a/metadata/md5-cache/net-mail/rss2email-3.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=<dev-python/feedparser-6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/html2text-3.01[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=A python script that converts RSS/Atom newsfeeds to email
-EAPI=7
-HOMEPAGE=https://github.com/rss2email/rss2email
-IUSE=python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=<dev-python/feedparser-6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/html2text-3.01[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/rss2email/rss2email/archive/v3.11.tar.gz -> rss2email-3.11.tar.gz
-_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0fb299e39c5a40fcef9d03a5dca9d8e7
diff --git a/metadata/md5-cache/net-mail/rss2email-3.12.2 b/metadata/md5-cache/net-mail/rss2email-3.12.2
index f7d22121fba1..913027072898 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.12.2
+++ b/metadata/md5-cache/net-mail/rss2email-3.12.2
@@ -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/feedparser-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/html2text-3.01[python_targets_python3_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(-)]
+DEPEND=<dev-python/feedparser-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/html2text-3.01[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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(-)]
 DESCRIPTION=A python script that converts RSS/Atom newsfeeds to email
 EAPI=7
 HOMEPAGE=https://github.com/rss2email/rss2email
-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 ~x86
 LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=<dev-python/feedparser-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/html2text-3.01[python_targets_python3_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(-)] 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/feedparser-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/html2text-3.01[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,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(-)] 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/rss2email/rss2email/archive/v3.12.2.tar.gz -> rss2email-3.12.2.tar.gz
 _eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c2a2ce8974637da7dd454f523454a236
+_md5_=a8aee0aa57e61e581f28a9fd980f9155
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 2528323c5286..bbbd53cfffe2 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/unifi-6.0.36 b/metadata/md5-cache/net-wireless/unifi-6.0.36
deleted file mode 100644
index 89d3231ef0fe..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-6.0.36
+++ /dev/null
@@ -1,15 +0,0 @@
-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.0
-SRC_URI=https://dl.ui.com/unifi/6.0.36/UniFi.unix.zip -> unifi-6.0.36.zip
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=51ea217376d9870a8efd5086c88d3460
diff --git a/metadata/md5-cache/net-wireless/unifi-6.0.40 b/metadata/md5-cache/net-wireless/unifi-6.0.42
similarity index 81%
rename from metadata/md5-cache/net-wireless/unifi-6.0.40
rename to metadata/md5-cache/net-wireless/unifi-6.0.42
index a6f76c8df6a1..f1d59f9355d8 100644
--- a/metadata/md5-cache/net-wireless/unifi-6.0.40
+++ b/metadata/md5-cache/net-wireless/unifi-6.0.42
@@ -10,6 +10,6 @@ LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3
 RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
 RESTRICT=bindist mirror
 SLOT=0/6.0
-SRC_URI=https://dl.ui.com/unifi/6.0.40-dd08d4673a/UniFi.unix.zip -> unifi-6.0.40.zip
+SRC_URI=https://dl.ui.com/unifi/6.0.42-703ac3104b/UniFi.unix.zip -> unifi-6.0.42.zip
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=024d4c2a0e2cf28a4c9e72fbb91f49bc
+_md5_=f9e8014244a467cdf0f69c8c6ec68cf1
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index b314f5b5f8b9..860009a9a9ce 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/fplll-5.4.0 b/metadata/md5-cache/sci-libs/fplll-5.4.0
new file mode 100644
index 000000000000..9e1c79a1e54f
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/fplll-5.4.0
@@ -0,0 +1,13 @@
+BDEPEND=qd? ( virtual/pkgconfig )
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/gmp:0 dev-libs/mpfr:0 qd? ( sci-libs/qd )
+DESCRIPTION=Implementations of the floating-point LLL reduction algorithm
+EAPI=7
+HOMEPAGE=https://github.com/fplll/fplll
+IUSE=static-libs qd
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/gmp:0 dev-libs/mpfr:0 qd? ( sci-libs/qd )
+SLOT=0/7
+SRC_URI=https://github.com/fplll/fplll/releases/download/5.4.0/fplll-5.4.0.tar.gz
+_md5_=7124480129c025ffd2cde262262c4cba
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 5c18c5b50f49..e52822bc43b9 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/fwupd-1.3.10 b/metadata/md5-cache/sys-apps/fwupd-1.3.10
deleted file mode 100644
index 844fb300f697..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.3.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=7
-HOMEPAGE=https://fwupd.org
-IUSE=agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1+
-RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 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] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) sys-apps/dbus
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hughsie/fwupd/archive/1.3.10.tar.gz -> fwupd-1.3.10.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc58045ef869061334853c10d8b820ec
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.3.11 b/metadata/md5-cache/sys-apps/fwupd-1.3.11
deleted file mode 100644
index f3995b9a34c5..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.3.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=7
-HOMEPAGE=https://fwupd.org
-IUSE=agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 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] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) sys-apps/dbus
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hughsie/fwupd/archive/1.3.11.tar.gz -> fwupd-1.3.11.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=384d92c44842b6c5db0904f0cc29f995
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.5.1-r1 b/metadata/md5-cache/sys-apps/fwupd-1.5.3
similarity index 79%
rename from metadata/md5-cache/sys-apps/fwupd-1.5.1-r1
rename to metadata/md5-cache/sys-apps/fwupd-1.5.3
index 6bbbd1e93ddf..14a96e163530 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.5.1-r1
+++ b/metadata/md5-cache/sys-apps/fwupd-1.5.3
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.3.5[introspection?] >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr x11-libs/cairo ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+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] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.3.5[introspection?] >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr sys-libs/efivar x11-libs/cairo ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
 EAPI=7
 HOMEPAGE=https://fwupd.org
 IUSE=agent amt dell gtk-doc elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 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] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.3.5[introspection?] >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr x11-libs/cairo ) sys-apps/dbus
+RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 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] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.3.5[introspection?] >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr sys-libs/efivar x11-libs/cairo ) sys-apps/dbus
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/fwupd/fwupd/archive/1.5.1.tar.gz -> fwupd-1.5.1.tar.gz
+SRC_URI=https://github.com/fwupd/fwupd/archive/1.5.3.tar.gz -> fwupd-1.5.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62406a78382aee51fa505722c3f0d657
+_md5_=8042a20ca9929ba59a4367bd25a223b6
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 4a6cefacf9ef..06fa59fe2b1b 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/cinder-16.2.1 b/metadata/md5-cache/sys-cluster/cinder-16.2.1
new file mode 100644
index 000000000000..4a167222e5dd
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cinder-16.2.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 app-admin/sudo
+DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
+EAPI=7
+HOMEPAGE=https://launchpad.net/cinder
+IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python3_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/defusedxml-0.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.22.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.21.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.35.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-6.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.44.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.34.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paramiko-2.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.15.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.15.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/requests-2.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/taskflow-3.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tabulate-0.8.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-vmware-2.35.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-brick-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils acct-user/cinder acct-group/cinder python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-16.2.1 https://tarballs.openstack.org/cinder/cinder-16.2.1.tar.gz
+_eclasses_=distutils-r1	6492ae184ebb9d8124e5e0b23db93433	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ce485c312d1457c4eba59df25efaaa7e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 13e4ca5a6a54..8555a9c16a12 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.4.80 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.80
index 6ab0e3ab1afa..9763fedfb01e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.80
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.80
@@ -4,11 +4,11 @@ DESCRIPTION=Linux kernel built with Gentoo patches
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 arm64 ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-kernel/vanilla-kernel:5.4.80 !sys-kernel/vanilla-kernel-bin:5.4.80 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.80
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-81.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-81.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.77-r1.tar.gz -> gentoo-kernel-config-5.4.77-r1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=kernel-build	042733ebde23be39ae073ec82458bcb0	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0e329fd07b017f4d98207e7f8b74e4ef
+_md5_=b100184acddace1ed7809cd1143a46b3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.211 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.211
new file mode 100644
index 000000000000..f95fa9f49965
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.211
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.211
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-221.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-221.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-221.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-221.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-221.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-221.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-221.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-221.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-221.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=47813ed6b4a86cbe396c02bbd21c5096
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.162 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.162
new file mode 100644
index 000000000000..5a9369f6ee02
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.162
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.162
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-161.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-161.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-161.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-161.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-161.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-161.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-161.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-161.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-161.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=709746865d6f4d23fa50492790a99d7b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.82 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.82
new file mode 100644
index 000000000000..8eda3545db93
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.82
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.82
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-84.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-84.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-84.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-84.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-84.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-84.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-84.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-84.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-84.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=896c2d651d189d7ece81a74320ae28b4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.13 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.13
new file mode 100644
index 000000000000..aa5057b9e919
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.9.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.9.13
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-13.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-13.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-13.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-13.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-13.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.9-13.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.9-13.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.9-13.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e5f4ee9512a36b3686d2c73f8f983797
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.210 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.211
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.210
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.211
index 85c773695d38..669c6abe3a51 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.210
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.211
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.14.210
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.210.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.211
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.211.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.161 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.162
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.161
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.162
index b28caa754f22..b8768e75bd4d 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.161
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.162
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.161
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.161.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.162
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.162.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.81 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.82
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.81
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.82
index cfcf4472102a..37333cfec48f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.81
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.82
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.81
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.81.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.82
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.82.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.12 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.13
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.9.12
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.9.13
index 2c21cc64d465..b6a17b244eaf 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.12
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.9.13
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.9.12
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.9.12.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz
+SLOT=5.9.13
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.9.13.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	1543bf4cdf0b10a5bf32d15ac7b8aa48	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=71a3056d94dc6959a5c71a4dea2cc615
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 1a94bcef0668..bf9e10c89588 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32-r5 b/metadata/md5-cache/sys-libs/glibc-2.32-r5
index 25c90e9a976b..966e5c6a0796 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.32-r5
+++ b/metadata/md5-cache/sys-libs/glibc-2.32-r5
@@ -5,11 +5,12 @@ DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~slyfox/distfiles/glibc-2.32-patches-4.tar.xz riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
+SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~slyfox/distfiles/glibc-2.32-patches-4.tar.xz riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eeddea3618a071526988bedb2cb78bc3
+_md5_=b201853bea8bef68bcfb311924481477
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index e46365c21221..7f3f1ec4f323 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -11,6 +11,6 @@ PROPERTIES=live
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
 RESTRICT=!test? ( test )
 SLOT=2.2
-SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
+SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8c5a4ce830a246ee5d5372efbfd5f597
+_md5_=6fbbc9a51234ac25cb6cb7b28c44bcc4
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 74331a801f7b..62ae0769c7da 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/microsoft-edge-dev-89.0.723.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-89.0.723.0
new file mode 100644
index 000000000000..97d573037630
--- /dev/null
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-89.0.723.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm pretend setup unpack
+DESCRIPTION=The web browser from Microsoft
+EAPI=7
+HOMEPAGE=https://www.microsoft.com/en-us/edge
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64
+LICENSE=microsoft-edge
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm] net-misc/wget net-print/cups sys-apps/dbus sys-apps/util-linux x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_89.0.723.0-1_amd64.deb
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d3e0209ecec241d2cc857c4d0cddc8f
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index cb383e263282..202db303423b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 08 Dec 2020 13:08:31 +0000
+Wed, 09 Dec 2020 08:08:33 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 83046a932fa6..a225e17b5b52 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Dec  8 01:08:31 PM UTC 2020
+Wed Dec  9 08:08:32 AM UTC 2020
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0ddb698f445a..0bb54226e5d0 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 08 Dec 2020 13:30:01 +0000
+Wed, 09 Dec 2020 08:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e8f9e8dde384..cbf6005313f3 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8135845b8bc6721e7537e46f7033537cf9ac30f6 1607431743 2020-12-08T12:49:03+00:00
+acee7b758e961aeb9d92bf034e4803b874b64a69 1607501058 2020-12-09T08:04:18+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 79e03d05d5bc..14c9c18f4062 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1607432701 Tue 08 Dec 2020 01:05:01 PM UTC
+1607501101 Wed 09 Dec 2020 08:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index cb383e263282..202db303423b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 08 Dec 2020 13:08:31 +0000
+Wed, 09 Dec 2020 08:08:33 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f6f6125bfd32..c5196a41df21 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
index 9f7abe89568f..9618fcae7a45 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
@@ -236,7 +236,7 @@ src_install() {
 
 	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
 
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
+	find "${ED}"/usr -name '*.la' -exec rm -f {} +
 
 	keepdir /var/lib/rrdcached/journal/
 	keepdir /var/lib/rrdcached/db/
diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild
new file mode 100644
index 000000000000..f538da3c59d8
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.16-r100.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+
+inherit autotools lua-single user systemd tmpfiles multilib
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="https://www.snort.org"
+SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre
+high-availability inline-init-failopen large-pcap-64bit +libtirpc
+linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react
+reload-error-restart selinux shared-rep side-channel sourcefire static
++threads"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	net-libs/libnsl:0=
+	sys-libs/zlib
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
+	open-appid? ( ${LUA_DEPS} )
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )
+	open-appid? ( ${LUA_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch
+	"${FILESDIR}"/${PN}-2.9.8.3-rpc.patch
+	"${FILESDIR}"/${PN}-2.9.12-snort.pc.patch
+	"${FILESDIR}"/${PN}-2.9.15.1-fno-common.patch
+)
+
+pkg_setup() {
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+	use open-appid && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable open-appid) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		$(use_with libtirpc) \
+		--enable-mpls \
+		--enable-normalizer \
+		--enable-reload \
+		--enable-targetbased \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+	default
+
+	keepdir /var/log/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+	systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service"
+
+	newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+	tmpfiles_process snort.conf
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 45a240f89301..ad7b443a6d13 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/valtz/Manifest b/net-dns/valtz/Manifest
index da366ca37532..0e0c8a2352d8 100644
--- a/net-dns/valtz/Manifest
+++ b/net-dns/valtz/Manifest
@@ -1,2 +1 @@
-DIST valtz-0.7.tgz 10638 BLAKE2B f6c8c476f523bc72531dd6537a7ed096b4fe15122db8ac8398b6ce325e8d61aecd3ef496c6102127bb8df4c8e0651201826ed4ccf79fd47616b6e083967412c4 SHA512 173e9f04399f8011b565ddfa7ad542c87af03da1b829d40b616271a993a282a1a3f54fb434db4837fb9ee4c3eb66a39f70ebf5ff5f13aff9c6fccfeabb3a3df7
 DIST valtz-0.8.tar.xz 9644 BLAKE2B f5a102931fdd58e9ac85ff09f93243f76268cf3fd7c8cd3853b463115d292250293ca17e430ce93d0e7e5b78d90805126e24538b2f10bbf314a9ca0dbfd54d9f SHA512 87ad87445fb68b962b43e1d4cd08f155bdd3fe83480134dc141371bec87a2facce7f45381df655921e2875bb77c24bfb184487d8055f18a3acff50d8f4fa5c71
diff --git a/net-dns/valtz/files/add-support-for-srv-records.patch b/net-dns/valtz/files/add-support-for-srv-records.patch
deleted file mode 100644
index f8b9435c2ba8..000000000000
--- a/net-dns/valtz/files/add-support-for-srv-records.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 9d29c28941ca629e223d0d4f20a833f10375d331 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 5 Dec 2019 10:28:40 -0500
-Subject: [PATCH 2/3] Add support for SRV records.
-
-There is a patch for djbdns that adds support for SRV records to both
-tinydns-data and axfr-get:
-
-  From: Michael Handler <handler@sub-rosa.com>
-  To: dns@list.cr.yp.to
-  Subject: tinydns-data SRV & axfr-get SRV/PTR patches
-  Date: Thu, 14 Sep 2000 20:37:50 -040
-
-Many distributions carry the patch, but valtz rejects the SRV records
-because it doesn't recognize the "S" indicator or know how to validate
-the port, weight, or priority fields.
-
-This commit adds support for the new record type, and adds validation
-routines for the three new fields. All of them are the same: ports,
-weights, and priorities are all integers between 0 and 65536.
----
- valtz | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
- mode change 100644 => 100755 valtz
-
-diff --git a/valtz b/valtz
-old mode 100644
-new mode 100755
-index eebda76..92aaa40
---- a/valtz
-+++ b/valtz
-@@ -100,6 +100,9 @@ my %token_name = (
-     'min' => 'Minimum time',
-     'n' => 'Record type number',
-     'rdata' => 'Resource data',
-+    'port' => 'Port',
-+    'priority' => 'Priority',
-+    'weight' => 'Weight'
- );
- 
- my %record_type = (
-@@ -114,6 +117,7 @@ my %record_type = (
-     "'" => 'TXT',
-     '^' => 'PTR',
-     'C' => 'CNAME',
-+    'S' => 'SRV',
-     'Z' => 'SOA',
-     ':' => 'GENERIC'
- );
-@@ -131,6 +135,8 @@ my %line_type = (
-     "'" => [ 'TXT', 'fqdn:s:ttl:timestamp:lo', 'fqdn:s' ],
-     '^' => [ 'PTR', 'fqdn:p:ttl:timestamp:lo', 'fqdn:p' ],
-     'C' => [ 'CNAME', 'fqdn:p:ttl:timestamp:lo', 'fqdn:p' ],
-+    'S' => [ 'SRV', 'fqdn:ip:x:port:weight:priority:ttl:timestamp:lo',
-+	     'fqdn:x:port' ],
-     'Z' => [ 'SOA', 'fqdn:mname:rname:ser:ref:ret:exp:min:ttl:timestamp:lo',
-             'fqdn:mname:rname' ],
-     ':' => [ 'GENERIC', 'fqdn:n:rdata:ttl:timestamp:lo', 'fqdn:n:rdata' ]
-@@ -340,6 +346,21 @@ my %token_validator = (
-         # TODO : Validation needed? 
-         my $result = 0;
-         return $result;
-+     }],
-+    'port' => [ 21, sub {
-+        my ($type, $s) = @_;
-+        my $result = validate_integer($s, 65536);
-+        return $result;
-+    }],
-+    'priority' => [ 22, sub {
-+        my ($type, $s) = @_;
-+        my $result = validate_integer($s, 65536);
-+        return $result;
-+    }],
-+    'weight' => [ 23, sub {
-+        my ($type, $s) = @_;
-+        my $result = validate_integer($s, 65536);
-+        return $result;
-     }],
- 
- 
--- 
-2.23.0
-
diff --git a/net-dns/valtz/files/allow-underscores-in-records.patch b/net-dns/valtz/files/allow-underscores-in-records.patch
deleted file mode 100644
index b76b231e6f15..000000000000
--- a/net-dns/valtz/files/allow-underscores-in-records.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7c5df8ad5c18a9f8b9440dbd1ae4faacf55b452a Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Thu, 5 Dec 2019 10:34:54 -0500
-Subject: [PATCH 1/3] Allow underscore characters in FQDNs and pointers.
-
-Modern DNS records can contain underscores for a number of reasons. In
-particular, DKIM records involve a "_domainkey" part,
-
-  https://tools.ietf.org/html/rfc6376
-
-that is rejected by the current "fqdn" and "p" validation routines.
-Moreover, any SRV records will have a service name prefixed with an
-underscore:
-
-  https://tools.ietf.org/html/rfc2782
-
-To recognize these tokens as valid, this commit expands the "fqdn" and
-"p" regular expressions to allow underscores as the first character in
-each component of an FQDN.
----
- valtz | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/valtz b/valtz
-index c68c120..eebda76 100644
---- a/valtz
-+++ b/valtz
-@@ -202,7 +202,7 @@ my %token_validator = (
-         # check all parts
-         for my $hostpart (split /\./, $s)
-         {
--            return 1005 unless $hostpart =~ /^[-a-z0-9]+$/i;
-+            return 1005 unless $hostpart =~ /^_?[-a-z0-9]+$/i;
-             return 1006 if $hostpart =~ /^-/;
-             return 1007 if $hostpart =~ /-$/;
-         }
-@@ -268,7 +268,7 @@ my %token_validator = (
-         # check all parts
-         for (split /\./, $s)
-         {
--            return 1005 unless /^[-[a-z0-9]+$/i;
-+            return 1005 unless /^_?[-[a-z0-9]+$/i;
-             return 1006 if /^-/;
-             return 1007 if /-$/;
-         }
--- 
-2.23.0
-
diff --git a/net-dns/valtz/files/fix-generic-records-support.patch b/net-dns/valtz/files/fix-generic-records-support.patch
deleted file mode 100644
index b266340a471b..000000000000
--- a/net-dns/valtz/files/fix-generic-records-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-mjo: cherry-picked from https://github.com/wKovacs64/valtz
-
-From 422cc33cf0da52d10c271a75cda271d5963da4eb Mon Sep 17 00:00:00 2001
-From: wKovacs64 <justin.r.hall@gmail.com>
-Date: Tue, 16 Dec 2014 17:13:17 -0700
-Subject: [PATCH] Fix support for generic records
-
----
- valtz | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/valtz b/valtz
-index e9b831f..c68c120 100644
---- a/valtz
-+++ b/valtz
-@@ -75,7 +75,7 @@ my %validation_msg = (
-     1007 => 'parts must not end with the - character',
-     1008 => 'integer out of bounds',
-     1009 => 'must have at least three labels to be valid as mail address',
--    1010 => 'must not 2(NS), 5(CNAME), 6(SOA), 12(PTR), 15(MX) or 252(AXFR)',
-+    1010 => 'must not be 2(NS), 5(CNAME), 6(SOA), 12(PTR), 15(MX) or 252(AXFR)',
- );
- 
- # NOTE : ONLY translate the right-hand part
-@@ -331,7 +331,7 @@ my %token_validator = (
-         my ($type, $s) = @_;
-         my $result = validate_integer($s, 65535);
-     
--        return 1010 if ($s==2)||($s==5)||($s==6)||($s==12)||($s==15)||($s=252);
-+        return 1010 if ($s==2)||($s==5)||($s==6)||($s==12)||($s==15)||($s==252);
- 
-         return $result;
-     }],
diff --git a/net-dns/valtz/valtz-0.7-r3.ebuild b/net-dns/valtz/valtz-0.7-r3.ebuild
deleted file mode 100644
index 131ff011aed8..000000000000
--- a/net-dns/valtz/valtz-0.7-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Validation tool for tinydns-data zone files"
-SRC_URI="https://x42.com/software/valtz/${PN}.tgz -> ${P}.tgz"
-HOMEPAGE="https://x42.com/software/valtz/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-
-PATCHES=( "${FILESDIR}/fix-generic-records-support.patch"
-		  "${FILESDIR}/allow-underscores-in-records.patch"
-		  "${FILESDIR}/add-support-for-srv-records.patch" )
-
-src_install() {
-	dobin valtz
-	dodoc README CHANGES
-}
diff --git a/net-dns/valtz/valtz-0.8.ebuild b/net-dns/valtz/valtz-0.8.ebuild
index b98620fc1489..66aaf7aaee85 100644
--- a/net-dns/valtz/valtz-0.8.ebuild
+++ b/net-dns/valtz/valtz-0.8.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://michael.orlitzky.com/code/valtz.xhtml"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 7dbf96e5b2f9..35b52348a318 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index d4723cbad55b..41ac7d3d1ccd 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1 +1 @@
-DIST element-desktop_1.7.14_amd64.deb 67755832 BLAKE2B 0d67d53bf8bb6e5ee6a538c061ad5633a9be169963663ccd0acf4be257c94e855d53f765cd860d8cd5fde57e5ec7b72c838bf16413e19fe4d4046189a54e21fe SHA512 ff99e055d834dbc2f683fa2c62d3abdfc1b41f07e0feddb0909da3d95437bb0cd9767493d8acfcc0a9b82041141e57185bef803e0ed5568af0df96b7dc729dc2
+DIST element-desktop_1.7.15_amd64.deb 69147310 BLAKE2B 499c9ed94aad4b6934588a58c31e80eca0cbf1fed8701e0a190ef7cbb27474c848667cf3b842047d495f220881fa36f00890bf33f2bc9ceb12134470f585b5a4 SHA512 02e47d9930ed65d9fc3e35ce02ecb913a0825a126040ab28cb6c8a261a68490d344baec4011fd04bc83ad7b421e359f9b9cde895227bb9f411f846104f6c518a
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.14.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.15.ebuild
similarity index 100%
rename from net-im/element-desktop-bin/element-desktop-bin-1.7.14.ebuild
rename to net-im/element-desktop-bin/element-desktop-bin-1.7.15.ebuild
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index a19aa695cd73..a2e9054af56f 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/rss2email/rss2email-3.11.ebuild b/net-mail/rss2email/rss2email-3.11.ebuild
deleted file mode 100644
index 48a91c06a6cc..000000000000
--- a/net-mail/rss2email/rss2email-3.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Support for 3.7 needs support from dependencies, first
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
-HOMEPAGE="https://github.com/rss2email/rss2email"
-SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
-	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-	doman r2e.1
-}
diff --git a/net-mail/rss2email/rss2email-3.12.2.ebuild b/net-mail/rss2email/rss2email-3.12.2.ebuild
index 0d679cf6d547..59ef7e4512bc 100644
--- a/net-mail/rss2email/rss2email-3.12.2.ebuild
+++ b/net-mail/rss2email/rss2email-3.12.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 2dc32df2219e..1665e965a5de 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index b200c4873554..b902bebf0fe6 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,6 +1,5 @@
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-DIST unifi-6.0.36.zip 232051560 BLAKE2B 94a2780c40588c2afb64993d839dedb6064f437cdf29cd6dd9124ef3944ae25d1942f3eed0ea080007800575b37d9063b3f007b91d02bc30d35179cb4263d873 SHA512 bab68b649c84cf62e4e646c62a8adf8006ab6d434907352f3970e7c81c779b4dcbaf8d1b5558cf69e7daede9c96fe0b02216700cb62de5659cf496dc899ec2ee
-DIST unifi-6.0.40.zip 237494905 BLAKE2B 29cb9161c958cc414f3a0eb47fbac045e02ab3856961f62013bd6f0edc24f2483beb701cc3eb91bf0316829508894e035a6555f16865688ac8e94ebe92c7d5ed SHA512 7b5d8eb36af190bce4e85515d14a2ecab665dba70cd0fabc3f7de23870ecb557858433bba6ee6e101c3e6e5ba3da66a7dc807d3bf72fd4d2f5798991a78839c8
 DIST unifi-6.0.41.zip 216846940 BLAKE2B 14aaabc6c33fc312ca26cae03eec7bc1a80c26d381735223753eb073baa4141e1791651e724fa6a75d16274abc2299b791d08f1032256ddfd2c6518fc2b3d30f SHA512 9264a322bf78efa38f009e81a7e7fd37534600d859a46221bc8237db159049510279c939fb2294907a94e59c841989b890693fdc800cde05d9f4e7cd6c50c7ab
+DIST unifi-6.0.42.zip 151690952 BLAKE2B 9f67f1dbb7b85f6bf92414a3d424600d610dc4ae926766e8b71dc5ceabdc1d33bccec3cbec839483aca40b2360c6dd8b31eb3de7dd20077c3d751c01b137cfcb SHA512 548f2d280065259270484e2530d800f829869eb5802939a2f13ba08ae99017f0a2dc5152e1b2f85d940a032326d4cb7d3a1a58649dc96428bea04156c26eab88
 DIST unifi-6.1.25.zip 235499342 BLAKE2B 77de866d2c04136b32e06698f3c20563dc68cf1bf5d260a23cad46ee208c5d4012d788c67dc3324578d2c944e8eceecf6b5473f4d77304e10ee15a3b14286fc7 SHA512 0eb916f06546a5b33da664ada77391a69d21c9ec4545244a1a6f55ceeb7546fe77a07a121df03ba606e98ddbd23429207f86bb5b2c24ddfb3174eb2d00c5daaf
 DIST unifi-6.1.26.zip 243498936 BLAKE2B 72a17f02279ecedd8f876df85167824a03abebb2816e68fcbfff11923b00c1e0b80b7357e48a4e044f0835e3e0054bd0ab034bd8fb3d67289bf61b4804ce9a87 SHA512 9ea5a7307ad507f08e4d39805bdf776eaa50895513e4c086d94527e28ae93b1f97e3d1b23ff314ed03ea560638b8cb44fc16bf4ff8f7746035e8b5de9b31321b
diff --git a/net-wireless/unifi/unifi-6.0.36.ebuild b/net-wireless/unifi/unifi-6.0.36.ebuild
deleted file mode 100644
index 58f3f74689e6..000000000000
--- a/net-wireless/unifi/unifi-6.0.36.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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=""
-
-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.0"
-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/net-wireless/unifi/unifi-6.0.40.ebuild b/net-wireless/unifi/unifi-6.0.42.ebuild
similarity index 98%
rename from net-wireless/unifi/unifi-6.0.40.ebuild
rename to net-wireless/unifi/unifi-6.0.42.ebuild
index 3eed307193aa..f724e3c60a0e 100644
--- a/net-wireless/unifi/unifi-6.0.40.ebuild
+++ b/net-wireless/unifi/unifi-6.0.42.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Set this var for any releases except stable
-RC_SUFFIX="-dd08d4673a"
+RC_SUFFIX="-703ac3104b"
 
 inherit systemd
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c19952bc31aa..fd1713eca588 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 3d5a5fd3b13d..da87b4380f4f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -427,11 +427,6 @@ dev-python/cheetah
 # Removal in 30 days. Bug #747310.
 sci-libs/mkl-rt
 
-# Matt Turner <mattst88@gentoo.org> (2020-11-08)
-# Uninstallable because of fetch restriction and dead download link.
-# Removal in 30 days.  Bug #725646.
-media-fonts/mathematica-fonts
-
 # Dirkjan Ochtman <djc@gentoo.org> (2020-11-05)
 # Incorrect DISTUTILS_USE_SETUPTOOLS value, dead upstream.
 # Removal in 30 days. Bug #748063
@@ -500,11 +495,13 @@ gnome-base/orbit
 >=app-crypt/cardpeek-0.8.4
 >=app-crypt/ekeyd-1.1.5-r100
 =app-editors/scite-4.4.4-r10
+>=app-emulation/libguestfs-1.38.6-r100
 >=app-misc/worker-3.8.3-r100
 >=dev-games/cegui-0.8.7-r100
 =dev-games/openscenegraph-openmw-3.4_p20200425-r100
 =dev-libs/efl-1.25.1-r10
 =dev-libs/libprelude-5.2.0-r10
+>=dev-libs/libucl-0.8.1-r100
 >=dev-lua/busted-2.0.0-r100
 >=dev-lua/busted-htest-1.0.0-r100
 >=dev-lua/dkjson-2.5-r100
@@ -547,6 +544,7 @@ gnome-base/orbit
 >=dev-lua/say-1.3_p1-r100
 >=dev-lua/toluapp-1.0.93_p20190513-r100
 >=dev-util/geany-plugins-1.37-r100
+>=dev-util/hermes-2.8
 =games-action/minetest-5.3.0-r100
 >=games-arcade/jvgs-0.5-r100
 >=games-emulation/fceux-2.2.3-r100
@@ -573,6 +571,7 @@ gnome-base/orbit
 >=media-sound/aqualung-1.1-r100
 >=media-video/vlc-3.0.11.1-r100
 >=net-analyzer/rrdtool-1.7.2-r100
+>=net-analyzer/snort-2.9.16-r100
 >=net-analyzer/suricata-6.0.1-r100
 >=net-im/prosody-0.11.7-r100
 >=net-im/swift-4.0.2-r100
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index fa607d5c928e..814e03db1218 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -2,7 +2,7 @@ apache		http://apache.lauf-forum.at/ http://apache.mirror.digionline.de/ http://
 cpan		https://cpan.metacpan.org https://www.cpan.org
 cran		https://cran.r-project.org https://cran.us.r-project.org
 debian		https://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
-gentoo		https://gentoo.osuosl.org/distfiles https://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles https://gentoo.ussg.indiana.edu/distfiles
+gentoo		https://gentoo.osuosl.org/distfiles https://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles
 gimp		https://ftp.fau.de/gimp/gimp/ ftp://ftp.fau.de/gimp/gimp/ https://artfiles.org/gimp.org/pub/gimp/ https://www.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ http://pirbot.com/mirrors/gimp/gimp/
 gmt		http://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.star.nesdis.noaa.gov/pub/sod/lsa/gmt
 gnome		https://download.gnome.org/
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9b611121f4c0..46dd3d91ad7a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2838,8 +2838,6 @@ dev-util/google-perftools:largepages64k - Use (experimental) 64K pages for tcmal
 dev-util/google-perftools:minimal - Only build the tcmalloc_minimal library, ignoring the heap checker and the profilers.
 dev-util/google-perftools:optimisememory - To build libtcmalloc with smaller internal caches.
 dev-util/heaptrack:gui - Install Qt5-based analyzer tool
-dev-util/idea-community:jbr11 - Install and use the Java 11 based version of JetBrains Runtime.
-dev-util/idea-community:jbr8 - Install and use the Java 8 based version of JetBrains Runtime.
 dev-util/intel-ocl-sdk:android - Install android related files
 dev-util/intel-ocl-sdk:system-boost - Use system boost (dev-libs/boost) instead of bundled one
 dev-util/intel-ocl-sdk:system-tbb - Use system Thread Building Blocks (dev-cpp/tbb) instead of bundled one
@@ -7236,6 +7234,7 @@ sci-libs/fftw:quad - Build quadruple precision lib
 sci-libs/fftw:zbus - Adds support for ZBus cycle-counter of mips
 sci-libs/flann:cuda - Enable support for nVidia CUDA
 sci-libs/flann:octave - Add bindings for sci-mathematics/octave
+sci-libs/fplll:qd - Use sci-libs/qd for quad-double datatype
 sci-libs/gdal:armadillo - Use sci-libs/armadillo for faster TPS transform computation
 sci-libs/gdal:aux-xml - Enable Portable Auxilliary Metadata generation
 sci-libs/gdal:fits - Enable support for NASA's sci-libs/cfitsio library
@@ -7684,10 +7683,8 @@ sys-apps/fwupd:agent - Enable update notification agent
 sys-apps/fwupd:amt - Build and install Intel AMT plugin
 sys-apps/fwupd:dell - Enable Dell-specific support.
 sys-apps/fwupd:flashrom - Enable flashrom plugin via sys-apps/flashrom
-sys-apps/fwupd:gpg - Enable GPG support.
 sys-apps/fwupd:man - Build and install man pages
 sys-apps/fwupd:nvme - Build and install NVMe plugin
-sys-apps/fwupd:pkcs7 - Enable PKCS7 verification support via net-libs/gnutls
 sys-apps/fwupd:redfish - Install redfish plugin
 sys-apps/fwupd:synaptics - Install synaptics plugin
 sys-apps/fwupd:thunderbolt - Install Thunderbolt plugin
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index fcf1af6816ba..cb57b4b3d328 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest
index 7db55152bdea..7de415791455 100644
--- a/sci-libs/fplll/Manifest
+++ b/sci-libs/fplll/Manifest
@@ -1,3 +1,4 @@
 DIST fplll-5.3.2.tar.gz 1284989 BLAKE2B 66d022c1a6acb3f029c871bebf4925ec5f9447af71829c6d52f2065155bf75f075965a41918722d095546ca18e8e87a85f181a76f5e42abd20c8de8165210bab SHA512 eacd990c468b1d919e1d6cc04f99656d982d5a3807970e0a1dd910a2703eb5b8eff913bc5c0e45790a547bb7aa71189fb9022024186bb84ee04d8602c9980ac2
 DIST fplll-5.3.3.tar.gz 1289510 BLAKE2B 116af9013a9c030301f2a37fae9c4865244c93de8d7a06e6f605387c4e421f9e0735c456291cb1e44d6da3c82dbea3a8f91709eea3f69a4aab1fee876f534aff SHA512 f69b98c9befe9f2ce15fdcb1b4c1bf83a7267f606770228e05416e13930d1ecb745824b1793ccc11ab13ddb0140c1daa6cfade50f2e79f93dee296880d98bef4
+DIST fplll-5.4.0.tar.gz 2612340 BLAKE2B 723230856461ac6418dad00e82fc7505dbbb7bfbbf68fa7f4f3240402d62f3e1ded3049c436a0f6aad9f020727d10acb3fe15dfb8b8a907f5b3c7b191e55e9a9 SHA512 a583aac73e4618ba240c28d3e8485cef6b9c184c11b33799404e96ab99502023073ed1c6fc0d3fbc4e6737415e9ea1a273f3f1e59ccba69d1546f56903567ebe
 DIST libfplll-4.0.4.tar.gz 413519 BLAKE2B afeea5a813d3d5b1b7fe3e81d5a8e9bce66ee4f8a3d265dacaa0ba7ff2f632f0f533182027322e2fd17645f5bc5816b266b167da0e36a00a38f73e794e22a522 SHA512 81cf61118f0dadca8fd82cc58df2fb5f0dc3ddd15a9b5de95a7777e0ece77d8f6a6d50d14ba7fdd6be6697cf375fac2e60792c94cc65f5a181c427dea84d552d
diff --git a/sci-libs/fplll/fplll-5.4.0.ebuild b/sci-libs/fplll/fplll-5.4.0.ebuild
new file mode 100644
index 000000000000..1dbb837fc8b2
--- /dev/null
+++ b/sci-libs/fplll/fplll-5.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Implementations of the floating-point LLL reduction algorithm"
+HOMEPAGE="https://github.com/fplll/fplll"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/7"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs qd"
+
+BDEPEND="qd? ( virtual/pkgconfig )"
+DEPEND="dev-libs/gmp:0
+	dev-libs/mpfr:0
+	qd? ( sci-libs/qd )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_with qd) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/fplll/metadata.xml b/sci-libs/fplll/metadata.xml
index 51b421021524..c35857534278 100644
--- a/sci-libs/fplll/metadata.xml
+++ b/sci-libs/fplll/metadata.xml
@@ -21,4 +21,7 @@
   <upstream>
     <remote-id type="github">fplll/fplll</remote-id>
   </upstream>
+  <use>
+    <flag name="qd">Use <pkg>sci-libs/qd</pkg> for quad-double datatype</flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 11f67753f36e..ad1131db492a 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index cb7cb3e32154..1e17bc3a9503 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,3 @@
-DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2
-DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c553e16836cc646eb04e3ac54ebd53d2e8615afb7f43b8cd79b7e6315ed688ae04b57de851be62ed6065579ebf SHA512 e300a84a1c2d7e44e2a1d5d86300487783fc3990b20b540065f9899705569bee8996eae951f32b6fac559e76955ff9b661aa9b181e4dc0211a33a514613ffddd
 DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
-DIST fwupd-1.5.1.tar.gz 2398842 BLAKE2B dce2da9807bc28c502281a75b98b21bab8fc34778ca1ed5e43b944cec2043ced7d3b997402d904eaceeb62d139182b883dfac0f4b6228750b18f8d0c66539d4f SHA512 57fa13d0c24cf9c8ec5341dca5392e054194861885233284a5a26d7c351ccdaab5a9ac9853681258882d42d21732302324719a709ff7e713885a9977430683ce
 DIST fwupd-1.5.2.tar.gz 2416756 BLAKE2B 8b5849c3b1a0758489cdc369dfa85658a3904bb9483484aded4a4f0d3ed39f0fa819171273dabf18c62a0249f09b1058269cdb57eb3c75590242f1ba6b1a0a85 SHA512 1ea7104c95f884ba52194d3136058f685ac1ad6d705930c4bc584aa4b1902164393d8702a14ec4a6af84e8b06d778a4896e63cbe9d3266f20da31d3795fc7ca7
+DIST fwupd-1.5.3.tar.gz 2429886 BLAKE2B 576823f6d235ed9ce2854cd0f44b9a7dd1eace46180ce978f906becaaefabb32e93f86cc672abafc99387427d33e3ab17052e98adfba4b6cbed85c5502a7ec1b SHA512 0c98dd7ca55afeaa4c895a837fc8d6eafcc51d215cc02be659916c7a39ddaa6bc3752adddba8cd2a9c77a4eca707b6c71522645f2847330c1c2ef44910451bf3
diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild
deleted file mode 100644
index a75d878756bd..000000000000
--- a/sys-apps/fwupd/fwupd-1.3.10.ebuild
+++ /dev/null
@@ -1,170 +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 linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		thunderbolt? ( dev-util/umockdev )
-		net-libs/gnutls[tools]
-	)
-"
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	virtual/libelf:0=
-	virtual/udev
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( sys-auth/elogind )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	!minimal? (
-		>=sys-auth/polkit-0.103
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? ( sys-libs/efivar )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		app-crypt/tpm2-tss
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		sys-boot/efibootmgr
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${CDEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${CDEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use nvme; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
-src_prepare() {
-	default
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		$(meson_use agent)
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use elogind)
-		$(meson_use gpg)
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use introspection)
-		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use pkcs7)
-		$(meson_use redfish plugin_redfish)
-		$(meson_use synaptics plugin_synaptics)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi)
-		# Requires libflashrom which our sys-apps/flashrom
-		# package does not provide
-		-Dplugin_flashrom="false"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
-	)
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r1 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.3.11.ebuild b/sys-apps/fwupd/fwupd-1.3.11.ebuild
deleted file mode 100644
index 378dc3009785..000000000000
--- a/sys-apps/fwupd/fwupd-1.3.11.ebuild
+++ /dev/null
@@ -1,170 +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 linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		thunderbolt? ( dev-util/umockdev )
-		net-libs/gnutls[tools]
-	)
-"
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	virtual/libelf:0=
-	virtual/udev
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( sys-auth/elogind )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	!minimal? (
-		>=sys-auth/polkit-0.103
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? ( sys-libs/efivar )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		app-crypt/tpm2-tss
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		sys-boot/efibootmgr
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${CDEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${CDEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use nvme; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
-src_prepare() {
-	default
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		$(meson_use agent)
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use elogind)
-		$(meson_use gpg)
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use introspection)
-		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use pkcs7)
-		$(meson_use redfish plugin_redfish)
-		$(meson_use synaptics plugin_synaptics)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi)
-		# Requires libflashrom which our sys-apps/flashrom
-		# package does not provide
-		-Dplugin_flashrom="false"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
-	)
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r1 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.5.1-r1.ebuild b/sys-apps/fwupd/fwupd-1.5.3.ebuild
similarity index 99%
rename from sys-apps/fwupd/fwupd-1.5.1-r1.ebuild
rename to sys-apps/fwupd/fwupd-1.5.3.ebuild
index 9ab001c44f90..4f976f3aff6b 100644
--- a/sys-apps/fwupd/fwupd-1.5.1-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.3.ebuild
@@ -52,6 +52,7 @@ CDEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
 	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	net-misc/curl
 	virtual/libelf:0=
 	virtual/udev
 	dell? (
@@ -69,6 +70,7 @@ CDEPEND="${PYTHON_DEPS}
 		media-libs/freetype
 		sys-boot/gnu-efi
 		sys-boot/efibootmgr
+		sys-libs/efivar
 		x11-libs/cairo
 	)
 "
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 757decb28e49..c4fce7423fee 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -10,10 +10,8 @@
     <flag name="amt">Build and install Intel AMT plugin</flag>
     <flag name="dell">Enable Dell-specific support.</flag>
     <flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
-    <flag name="gpg">Enable GPG support.</flag>
     <flag name="man">Build and install man pages</flag>
     <flag name="nvme">Build and install NVMe plugin</flag>
-    <flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg></flag>
     <flag name="redfish">Install redfish plugin</flag>
     <flag name="synaptics">Install synaptics plugin</flag>
     <flag name="thunderbolt">Install Thunderbolt plugin</flag>
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 7e6a16f254a3..0a031deb00ab 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 4ef1b661c341..c369d8afca3d 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,6 +1,8 @@
 DIST cinder-16.2.0.tar.gz 5484918 BLAKE2B f2259dd21c060280e856c053bece8fd635f289d8100710b177105227a5ce3a4c4e380b49261671294cf85975c9f665646cefe5f9d66d873e1938a7d141156f4e SHA512 586057d49f9c94daaf163dacf979e62d18be7489b43eeedfa7caa4d23a4a6060f455eea7162020319187466f308d0480a3efb047d0b34ce013f1b5c632e30755
+DIST cinder-16.2.1.tar.gz 5531297 BLAKE2B c517515df669e9aafbc1b8d80e8f422bbe6cf55ded044d03fd21142fafdc2e81f5f211c5ce3f39f2fd965f324194635efa7b53aee05113abff8f9d2f6438f3f9 SHA512 37fd7025f4490a35214bf4ac90b5b8ec9d21752ab54295403e6d485e429ffe8172c33e692e5f516156a58358b35da60fc7a8f7f25daa4b0d405db25beadd59b7
 DIST cinder-17.0.1.tar.gz 5815391 BLAKE2B cae43e4668560b9a329e65738533a6c015b42210c45f10d82ab758509f676778503152ba75f0ac862b040b9a489b92cf59f8da83e36e9610696e14c9e0d573c8 SHA512 44cadb33ea22953c05105e336555798b2332b0c77f1e9baedeaef58fe300caa70174a5fa4ad94a515f1bd0c685b15ca639053001d4a5b12ad9cceb385f2a63ba
 DIST cinder.conf.sample-16.2.0 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
+DIST cinder.conf.sample-16.2.1 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-17.0.1 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
 DIST cinder.conf.sample-2020.1.9999 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-2020.2.9999 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
diff --git a/sys-cluster/cinder/cinder-16.2.1.ebuild b/sys-cluster/cinder/cinder-16.2.1.ebuild
new file mode 100644
index 000000000000..3065830afe0f
--- /dev/null
+++ b/sys-cluster/cinder/cinder-16.2.1.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 eutils linux-info
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/ussuri"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}
+	app-admin/sudo"
+
+#	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]  # do not include, upstream depricated
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.35.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.5[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.35.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	iscsi? (
+		tgt? ( sys-block/tgt )
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils
+	acct-user/cinder
+	acct-group/cinder"
+# qemu is needed for image conversion
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES=""
+	if use tcp; then
+		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
+	fi
+	if use rdma; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
+	fi
+	if use infiniband; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	fi
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# only used for docs
+	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	doins "etc/cinder/api-httpd.conf"
+	doins "etc/cinder/logging_sample.conf"
+	doins "etc/cinder/rootwrap.conf"
+	doins "etc/cinder/api-paste.ini"
+	doins "etc/cinder/resource_filters.json"
+	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
+	insinto /etc/cinder/rootwrap.d
+	doins "etc/cinder/rootwrap.d/volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+	# stupid python
+	rm -r "${ED}"/usr/etc
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f33a416d957e..de0580719835 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.ebuild
index 89ed2cf03886..348823c20ed5 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.ebuild
@@ -38,7 +38,7 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index fc57411ed715..49592091a471 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -19,6 +19,9 @@ DIST genpatches-4.14-219.extras.tar.xz 3340 BLAKE2B 2a7077ff685b93d393f8c1ef3e7d
 DIST genpatches-4.14-220.base.tar.xz 4745992 BLAKE2B 71ded67b5bf42e8974fc71f3c47e7b7c38a4714f004d0eab1d3fc659318382518ec265d21d36e46f8b5f7ac5d5dbac77bfd5845c45c0b10d6e8ff83af662df1d SHA512 5ab21ec37af7eec0a6322bebd6ade3043afa449ecf906fa36375b1b8f6afffd639e84eee9928916e4d5c2ba862e9ebd85b9aa58371e4c633666bc524efe05d82
 DIST genpatches-4.14-220.experimental.tar.xz 6088 BLAKE2B 5146d0b4a651db52fbab2fc7dd90805f81e790ff1ff414cb1db062c23f8cf68bc136f9e2176abc140c3895ba1d2f3612939f06a5974686c6ca1673ccbc9bc785 SHA512 d27f48b31bcbad863d7fb4f58dafb1793e50c8afec88c96e42d5973ecbd6ae6aecde47a0640d4d5cef659356bc2f4326b8a0403ac694cbdcc7a866fa686b4d33
 DIST genpatches-4.14-220.extras.tar.xz 3336 BLAKE2B 3641a778efd8776ee3702ee4da9ad55521f53bf9260c0d8712af3e3bef19b51a7a54ba7708db64d27b1a18003a1dee98594819680ea84980aa5bb174675cc76e SHA512 ef25506c1ddde134a1b95c16450b06e4d9c576e807b5ab9859d8a169d475fc12d1d4181f712b96356a1547c58faa652066a9173b8ec9915a71e548b3bc11abe5
+DIST genpatches-4.14-221.base.tar.xz 4750680 BLAKE2B aeb5571c47653ede67e1d67ed9e1ff7c0b17fea0f441bf8e629f54433efe846ad5974b47fddf63ae811a0741544e80de28eaf834a652b59eddbdfa116bb589cf SHA512 be47d6254f62558ac6809b207d2608bc9cb1da26a85d0c029edd92b8fe8e185d4095ff3bd405ae9e1f778fb445b72297e92ec003fffb93b6376efd906a976abe
+DIST genpatches-4.14-221.experimental.tar.xz 6088 BLAKE2B 99e0b83c166a1ec9aea2b95f3a5436598b8208b394f82a59a1f7bacf4266425669f5d409831a8c56a229572450f71a41b4dd9648fc5d8c09449b1c1e36f7f8e5 SHA512 da0125d15a8a51f66ff81d996cc06bb2a9c302d2c2558379ce34a1705b2eb691706e475da22ce98b22fc8022182a265015fe8e99c281d8954a228c7682bfde3d
+DIST genpatches-4.14-221.extras.tar.xz 3340 BLAKE2B 79c2c05b9c4076c50206e6b518599ddb74ebdbfa9dbdf23d63c255745a2d399129a5501e72012f3b8d6982db55a91ddfc14e590d5e9c5feb95a113f6df46881a SHA512 a969f85e6a6fc7b55f426138738759805cb19a8df3e27c0d1c5b1e6235c61fe3ccff95cd98dbfa2aeca94008673a83be4bd3c1acb693ae3802560b87b1e47d6b
 DIST genpatches-4.19-151.base.tar.xz 4004372 BLAKE2B ab830d3f5ae37f48d4aa71e6b9913498397c00fe17630184b7283b42415ed55b2a3fe0d9d3c619923f43c8e244b476ed28916f0dc2e44c53dc8022a21ad152f8 SHA512 0b7d374b9dbd90f99ae73537e543d19c253d219ffea77e56a1c6825516d94f5bf4e2d85323f5a7318e0b8b5233e8b7363fbb2962e60c09b5c9825b1718bc7ae9
 DIST genpatches-4.19-151.experimental.tar.xz 6976 BLAKE2B 136a9a1f5de573917000f3b41f28a6bf84b61588cc8d61824d43df5fd191feb4608a55e5418633f18df9002dde899670a03b9713feaddf6b60b64c207005c256 SHA512 1650b33e6a3a431d91c3d9f054bcfe6a3bf3a93d2eda87beb23af93846f4b04ff8b67f31e71361584bd8963e2cacdecea7c33ad15e273c3b708aa353467afce8
 DIST genpatches-4.19-151.extras.tar.xz 3316 BLAKE2B fd6adfc4ce72c3a84b4821c6adcc79cf421e30609c1556dd9534b851faec4b5eb92210a48d2cf5e3c4a34781fefd4101ee6ede03808bbccd5aeb5875cc9d4515 SHA512 288a504278449d0646377e9e6b5191787fc218d5912a2298b7243a0cf8cddb21a7108449e9868f36c6e97e43081e8eafa880093ad1d87673f670042e31467e59
@@ -40,6 +43,9 @@ DIST genpatches-4.19-159.extras.tar.xz 3312 BLAKE2B 480dfb15464c46ff0cad7447476e
 DIST genpatches-4.19-160.base.tar.xz 4190068 BLAKE2B 9239276be20d03962b0d823c7cc1a83167ca3fa4f6367268ceca8cc597740ce1883fcf08cc78e5b2298bca41854f8524ce9504b0ef4d8548096b953eab94e7f5 SHA512 921de33214f912555a93e07f4703bb46cf20e5f566ea5cba5fcb6bdce6e0f671a94c5dc17b89582e8938e1f1a6e6e59954105ffa6e01e1dd141e21eaca658a7e
 DIST genpatches-4.19-160.experimental.tar.xz 6976 BLAKE2B 083754458a1585098c4831b954c041226fe49459a9aa06f79b16292994d2b2a796451f9f337508733ad14bea411b623c67f3950ce36aa7d04dc0da2211b27678 SHA512 9b0723f60de46805681fd57d167a4fcfdd7826e8479f5bbda449727e96aaae8242a2a275ae8f71b04eb4af998b6726830b9c66d2305f438c9165de4979066902
 DIST genpatches-4.19-160.extras.tar.xz 3320 BLAKE2B daafc306f8f634acd3dccd2726340b0e52e53ffd94f6baec5ad15f7c2ad4a908bbb6690c6b188141d587998d7d3d8dc1141d48475f4b9d15890f834f026a917d SHA512 da7e4dc03410ee8342a493f5ea3e74eeaabd81db667e3d46c641a0bb0ca8d124b324d5f4fe921987f38e2c4bfc35bdc16b6772e4e43410497f2d862a9270c209
+DIST genpatches-4.19-161.base.tar.xz 4197272 BLAKE2B 4302320718b7c1f64afbd03cd6c234217c50c56f19047a5822fa3d7ed0462dd65f83768cb933a4034308eb16573bf406ba8bc5742e0cfc5dbc1e6a2f0aed3c3b SHA512 cfb81ffd4bdfe26aa8f49ea627f99427b0ef49a121d2f657c40012a75b1ddda164e5e551609eb4b032ad950eb670515fa6373ba997bf030ff727cb353dda9da9
+DIST genpatches-4.19-161.experimental.tar.xz 6976 BLAKE2B a9bc282f1a37effce76f5abd110c933d4bbdea27792f32b9bcd73d4bc43b3348b8b993574b500622819d681df59f0b3539bae1a981ab49bae09f1e4202d6b062 SHA512 c032968d4db4eb6efd522a4f67f5917ad457a99ebfde9c8eee5f47ffbabd7be6d9b391c9581ee73808b6c1965b3011c87085d2f5c221289ab025ebbcce390a43
+DIST genpatches-4.19-161.extras.tar.xz 3316 BLAKE2B d59666d9996383eb96958aa4ab299583196023a61d97071e86ad1b51a428b349b610d07845e2d8ce6563981d8d512dfe726d2f183ec1bcad47e9995a1ce9e599 SHA512 6d2bc20cde1896fa4c8bf9c276f58f9981d84b79baf1729c1a32fd7afb2a6a30b0b64f88fe17c87cd6de29ce891028245b6d388c0ebe95bf6f8f46ce64ce3ee3
 DIST genpatches-4.4-242.base.tar.xz 3875244 BLAKE2B 68290360fa72bdf29eb6233ac762cb74d3cd8839f4e46d972e86c85944468f15ebc183efba6f8e28d8e64b1dd5568ab81f1b42178cc3606ccccda82566fdf817 SHA512 daa0026c97721043963dd02b9996c6a84ffc82e046533ab20b70520b3d7711288816ae3a98bbea671ae0d06b675d727dc508a38d82de3ea126ba8dd797c5d680
 DIST genpatches-4.4-242.experimental.tar.xz 83280 BLAKE2B 1af36c13ce2967a172436a3ebacee54e46a49478a5ef01aec66c428a9d885b638dbce2eb15276a602dc9d90866175baee5b04f3e8ba6e0478c9a10e23a2062cf SHA512 e9a0ebd1016b170e89889c59d0020c6e3a28fb0576a13f65b5adf764c950df65d64f2cf8a75d8e5c09131c8429612e112a4a452aeead3e74c96ebd0a8b12039b
 DIST genpatches-4.4-242.extras.tar.xz 1788 BLAKE2B f511bd0b8c25664b89951a7c990e1649ba765043ef6f6b37e0f5a7b63a4c234f0366319323cf8c463faf592190f226b17958a8cf515c307262f93af1e4d62085 SHA512 2822691dc7ed45753fc4fa972e1941bad589448c450f6948678c64e4078f50dc24abb0bdb9323e0e02c82e3dfb88174376f8f02cb54bcf52b0b283a905c6b4ca
@@ -109,6 +115,9 @@ DIST genpatches-5.4-82.extras.tar.xz 1772 BLAKE2B 8eff7ca01490badd5dad15497f77bf
 DIST genpatches-5.4-83.base.tar.xz 2815436 BLAKE2B 5bf3a971d5c14baca0b21a8aad8ffc4e470f91b179b5e03779be4f588b43a671fd2f261325ca0525139c3c7e9c2b7c1020a803045eb809b2857c61134d919db2 SHA512 96735cb1c2107eee8a7d475f6558e418264dc1aba7f2f803b59db5ed7a9a249d5d0b79689a539b46e8922ce1b278b578d4194b20f20962c2b3aae83ac58954e3
 DIST genpatches-5.4-83.experimental.tar.xz 6696 BLAKE2B a56f189a5b55da43e244c64df106c02655bdbb40014d999c01039ca953d8b17ec5227230de2fb53f774536f57e2d77e66c5aa94c0bb5045fabe04c815118843e SHA512 9876ace02d7a4da2642aa46bd096f6dfd1c59efc8d5ccd39157d0628724f3d20d52f49c81bc702d1990a0cb475baf1eafec7cab3be2b3fbc2164f290b8469566
 DIST genpatches-5.4-83.extras.tar.xz 1772 BLAKE2B 9bccf13ea0eb0aae0d0b84302b9e9c82986bd60de4e85ee3703c570a5338474b08580095a952749d43104b53d3c07dbb558473e707a13ae12f7da5e5020ddf3e SHA512 0b536e4f8961513f181c5d9c4c01b51656c1e53707cf19c26d858e1a40bb1e8bc9e0bd0b314f82252047fe45a8df3e306e06abdb88f67a6116736e89236bbbcf
+DIST genpatches-5.4-84.base.tar.xz 2822596 BLAKE2B c3cc3d6435b084e911d1ce12028fb43f986061556db53eb703290cdf2058076a4b670a472b5e53c7cba733d5ecf552b8df12421004b8f36ff69b147b828d4418 SHA512 fcd469482cce45c537e0977a23ef7d8c668bcae585ecbdb33b003173dd601d3dd8666535072bc9caa0ed0cbd954fa3f42deabdad82e5310e5c83cd745a78787c
+DIST genpatches-5.4-84.experimental.tar.xz 6704 BLAKE2B 3f727923c782ecdcf5f412da1c63431d464bd1323aa6ac04802d6913bcc8f9f9a0cfd6e2e6f7cbceca74b6013af35112c140f19584dc2bbfba741f2f7c972f82 SHA512 00fd24ff264d46d8fa3407a88dfc0ff1acc7bed3706416f90c0e97b65c479384d34d0b02539a89cb8bde9b8fc32dd80786fd3ec6eaa27fe7d028f569d8c71737
+DIST genpatches-5.4-84.extras.tar.xz 1772 BLAKE2B 3951ecd7d506fce8c59b3699a132365c06262fb9b02622123ffd8961fd7b39cd07896f8cb701452fbb5bfdc5d80011ad06c0537957ea0fb8b99cab16743b2e80 SHA512 d3450ca9ed556251e9922ad96356696434ba3d9b4ae9e46c908522803bb48368e167dab77abe8e53767ddcf89ca1516c04334ed1cb182d1bb932325dd1b7b2ae
 DIST genpatches-5.8-21.base.tar.xz 783528 BLAKE2B 8b4e64de64d97f069014d353e45aab7900b37f508ed8e99eb469797df4780f715e0c038fbeff4b8ebb34e81c935dfd7df3eb63324121e31c1dd07591b3159a3a SHA512 4485056f47723e14f5248854edcd4353562c5ec6cb95c926310815e5bf5514d5d8edce16a241dc3d881c57832333f950562b092c21f2555a6838b9106ff329a4
 DIST genpatches-5.8-21.experimental.tar.xz 6060 BLAKE2B 42cc1a6c5a7cbe3086321ab4a6616f0cbc758b34061a82898c8d4745f9550e9bb60ec3e76b176c95962834358052794e9bd4ebbccbd891031b3cdce12a62c2e0 SHA512 c98a560c0b564ae565ab1dbc2421827593568be5010b4b0fa017def4b2401d737c89499f7b9558b6c8700b2dca4bf0e0bb86e172b43c3092cc7a867775a8fe8f
 DIST genpatches-5.8-21.extras.tar.xz 1768 BLAKE2B 238c16ed6628c2fd379fa46cf700038c08358e26af5fd4e7f1037626e2057fcbf224df72a6bd1df4b95fa896793539108294d3523118ee7a6cb7e39604e91112 SHA512 c14b718bf292707472edff04b022c722f45330b7750dd4b7b507347b0a9a29ebd236e16f01c03b6aa85bacc9220b420f5108f7728e88e6566dbb888efdbce714
@@ -121,6 +130,9 @@ DIST genpatches-5.9-11.extras.tar.xz 1764 BLAKE2B 51e216b1f4970b10e89fdea37bbe56
 DIST genpatches-5.9-12.base.tar.xz 628408 BLAKE2B 6dbb2c992971cf3ee1c0a0c7a7b70876bcc41e93dd6def0fe87e2a4ddaf62ebfe808487ac117b79eb629c34e66ef1a02bf7adc2191c3273bf77ea384260a5bd3 SHA512 bde0614ff1eb3dc9f681fa8a5f8207c8d2f9a959984fd3a0c8bc4da8ca432d6e1a32992735a8c59074de738a6d1341aa688efc75eaca6cb575f41e694f333d7f
 DIST genpatches-5.9-12.experimental.tar.xz 6088 BLAKE2B e6773b615967443b961e498e50ce50c48608b71f0373bbf8c68d2aac4906c18dcca3e1578157ab0413c700ac2f67140fc47901c757d8292e1d1051f6ef77c21b SHA512 bf21c813045ecd51d2fef01f15269eb77c9c672e3133dcbb60461190e6c5b5f7f3bacf557b7d48f4bed702ba3135a665d319ed218cce1b8319ee83d93d1eeb19
 DIST genpatches-5.9-12.extras.tar.xz 1764 BLAKE2B 8bfbde759342d00f10d6fe12e313d449de35aba13a5ba3564043d0489205eafa709a6481e7249bb79f54c84c759f50ca7f630e2e2bbfebc71942f72b3c8ea6e8 SHA512 274a2d2fce2f446503c4540d30daa3c3d6a86e6e6c206f0a2e1e89ee1ebd496f6ce2706add35ca6fc39df2c0758719faf332a230db18dfa9f81dab787f24eb3d
+DIST genpatches-5.9-13.base.tar.xz 638532 BLAKE2B 758f41192c8075719abe2ffb7756d3a0a4424623b9f99667a7ba19c6311e8e15dbda735076566843cace115059a8e7adb24bfcbc2a1271e230bd96328e1856b7 SHA512 723867c07a238b9a79b748a2b0fc8716614cc2e520d6ceda58e256f99a837f85c1a64885f8d3dc7904f1d3f8f1b8c8e990a12238dabff2c07fb095c56c44518b
+DIST genpatches-5.9-13.experimental.tar.xz 6092 BLAKE2B d242fa30772a993f885f4b4d9c075c4c76c83e6c07f907ac203c42613c91512dd803ee66194dd5db19bd215869d970d2241e663a57dbe347cacd65a5d505f2e2 SHA512 9471ae9fbcc79f8efec64bd05269ee7be97f9e40e20a9737d2bb262bcd17540ee9266009bb60ef60b0ad5f7de577c86ca0912f31b9ffec421eddb90a53f64b40
+DIST genpatches-5.9-13.extras.tar.xz 1768 BLAKE2B dc4a89f09c4a771f7b6011c3b5bd31dfc7a6254b09c48308eb8d3f13b21996e76b2893660e80a6f4a6116f06b3ba74834d8112d4eacd4b53a88a26ce1330dd52 SHA512 07d75cbbb25dd4d51cf3fbe24fe5c5e6430ffc3422c3335fc6916e18903922b8d22cd6d422c4bb38d233200d59971442b0ee64bdc27ecb257f9acb0124df6d3e
 DIST genpatches-5.9-6.base.tar.xz 406744 BLAKE2B 79052b91967819329a94b796ad72d6b7eec43d2e83615333abb7b9e0f3c7b737687de05e4ed8ebdb1db064ee16c2b45786ee3652f6f4b107b7e64ee309d9bb1a SHA512 2ae6a445936221337035b9d38336285c8dd2cd9cf2686bdfdd7dc229efb8f61d3088b834c8c63ee633ea197cd48455dffb24dcf11aef0955c42e4e271da76f42
 DIST genpatches-5.9-6.experimental.tar.xz 5828 BLAKE2B 6315137049438fca8a3835858321311dcf1a3ab374eb7c1cc0ec77847891112490ebc8427896381da78b2415855a73b444a69c5a521438f09df55219d96a9a77 SHA512 81bb35477a6e6180b08776b0a27fed4703e8796a54110959869b8ed86100c6e9c71b8ea523e5f905099ef64f8b99a8c5f699e0ce32d4c76dead9bf2121feb1b6
 DIST genpatches-5.9-6.extras.tar.xz 1764 BLAKE2B 3ea79d40f67a97fe14c5adc7c0f5bab19ab28bf37778a334c50852cbbdd91f32ff696e65e9a8f703c8573be7714447a75913c1783118d7b8acaaedab8518075b SHA512 d0f470637202283ae8295bf822b86609f426023fa6f0c00b1a3c0cce461d005c3804bfc7cdbcf965ef9d6a2e68917c2fdbcd30329e551b91d50055106c4f5cc8
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.211.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.211.ebuild
new file mode 100644
index 000000000000..661b8d4c3137
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.211.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="221"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.162.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.162.ebuild
new file mode 100644
index 000000000000..0e20d16a8654
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.162.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="161"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.82.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.82.ebuild
new file mode 100644
index 000000000000..3398c022f79c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.82.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="84"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.9.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.9.13.ebuild
new file mode 100644
index 000000000000..3cf5734a28e2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.9.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="13"
+K_NODRYRUN="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index eb0757cb32f6..7ea96eda94d9 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -4,9 +4,9 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST patch-4.14.210.xz 4041652 BLAKE2B cd52ea48f1f78d46b0946caa75e0f00fe7a07240e1c2fcb7e54bde4cb8fd7d7d1bd3ed8ccfb1667cbdbe24ef80238905ace25dcb9c1cb823cf413964554bd6ed SHA512 91802c8d4a86a9c97396d4b3349619754011ef1a38cc09982d66bb9376aae82c38045a52ca1aa70dcb2f4dc9f5026cfc04c73f970fe135ea882ed5bbf69d0dd4
-DIST patch-4.19.161.xz 3649928 BLAKE2B d9208f6b07a59c14e9f46acca1b1456bc02e8afd64b2c634a8376d28bdd5df61de66e7cfd42a9482e986d8fb822518b3dbbac9bde4f2e0257fa73b4dba59c51d SHA512 6483da5d53e4660515fd053c3e6ee3083b222db199d8de3b00a80fe7d2414f61e4bfc2abb88d8186943c8aa01e16bf29ef38e352c32e0ccac29ba6555523ae00
+DIST patch-4.14.211.xz 4044992 BLAKE2B 8d7a79b6fe4e0eac89b90581ae62d6cbb81fb6632da338641014826645e48e992031ae7aeab8f39b3121a7fa5229599fc44f172a0293e6a8a9d99ac7304bcab0 SHA512 21f3061ca131e17f6cab857568dcd605570685c8d59c9892165e98492e8261931017df33f43e8f2b0a191e582ddb60060f12dc54f1a164b3088c2e5758fdb6bc
+DIST patch-4.19.162.xz 3655396 BLAKE2B 92b492899306eee4dd88a3c893d0d234da99c24b5f9642bada1d6f2df0ef28db3374277492441a06fcaaed3d6e04d367a09ec127cfce20f04174f0e6c8e27a91 SHA512 231959d1fcbb07faac4b40599b6aec6cc46aad8f89debbdddb1003bdf742abc9e2afa43e70c9baf40949aaf6c23d6aa10c1ba0cb5137268b443081faa3b77c20
 DIST patch-4.4.247.xz 3404480 BLAKE2B 5095d7353b56c11ac42c56640dd6223c5f5418aeb367ecfefb103ab8c94eb20e88bc5dc9fbba5722d2f1cbcf733b8b0133943213d8b0f2550ce3d41863d546c7 SHA512 353eb02080153a651faa50aec7bfd36ace06e683699ffafd1161addac6bb9a5d1eb73ad8259becfa0607f75ea6f761bea807d88d5ecc15808413026f74f03825
 DIST patch-4.9.247.xz 3788468 BLAKE2B a866ac523f2612b384794cf07a18ed1a414c8d34c501fb02a7e40792e73bdc576c65e7ec77fab3f04cee4dbd4534f45811c729a6bc17f044ed2196a0fe6877a8 SHA512 4af0e2c93e70af1119f28ea68f3ed1a56226fc0e00d0ec8d12e42498623afe74cfbcd44db3087bfb7748b7148deb3836c7924369e6e6102809a40084bf242a1d
-DIST patch-5.4.81.xz 2396180 BLAKE2B 3a42b28cb5fb9cdc83171df46854805cc39e83f122f47b00eb823a05c0663880e688d7c44dfd2c21875fdbb0f02e494396df69ce07cc4ca76d03cee521d48ece SHA512 f97b6d8d58d43449491d543dd0c3afe8e4c7f7ea4527c4712b0bb6b7a4817daba61f507e8518a4f72254042472d7b5f8095e5df1c131fd010f4c0453c9d8cde5
-DIST patch-5.9.12.xz 612468 BLAKE2B babdf390cba9ede83b9056c90f769b98d58d86b168b8666035bf17e3e7d5f942d45a7392e56b6acd0423d0a4e8a1b3fa629a40ba12ba4a8ced4719b7218cef70 SHA512 eef914d5124dae25d0d5c6162cf0d19cfe6adabd3da5594609275527ac7bca9b8b3c9bdd8ae5cbc061cb93a4559c30daed3f104f789b31caa2596f3da371f2aa
+DIST patch-5.4.82.xz 2402752 BLAKE2B ce62e0fd0898f369d9bd39e1ff69a8bf75e8c7e6dc7e4eafc48d0f943295ebb1d7ad8d3c02a9352344ebf76a2db39771ca5727589eacbb204cc44d8541a05b31 SHA512 8455d7a0c88f6b764ce4061cf50f00d505c8d1ddcefa97ad7f826290b981b54a6025a982881dc16cc6c58ff76247186c7a520ed9c488df9e1b86f5b0625eda94
+DIST patch-5.9.13.xz 621916 BLAKE2B b72d57e43df1c753440de453fadc365378f1369c1ff19e0861dabd024feb2ccbc3b7bbaf9358ce96cab5a1249b1e0f3abab694a1f5569be924a5e932d6ce6a73 SHA512 404d7d703f5190bcd08da5aaf55d1b6a82efb5c9a168334b6a372500534e23fe53b9ec2d2dec5a8acf96f2c367fcf701bf1ba33746948a0719e1cc2b2061bfc8
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.210.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.211.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.210.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.211.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.161.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.162.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.161.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.162.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.81.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.82.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.81.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.82.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.9.12.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.9.13.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.9.12.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.9.13.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 3240b432d61a..acc4eb979f65 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 9ee95ce4633c..0dbcfc6a043d 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,6 +1,7 @@
 DIST backport-rv32.txz 26416 BLAKE2B 7a6b593859f88a3c040f06324dace4cc6137d14d4580fad9ea285829666d761c3dd01c190746e86846c219423124c77a55bc57b6e56efe6401a9c99d7fa445cd SHA512 d08dc02c4f0a3c5a15c57fbb5190588121c0e0728e6ab2119483407a98625efe58b3c83b44d750b0146171e63dcf8a6dbb6d1a057d042f794eed9adbd1f0293e
 DIST gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 8064097 BLAKE2B 3cc5c82cd57d0fbd26d9a376ee8ca02f119fe9d653311cbe4d2b7b93aec2290adac3be271be19a7fdedae2e11e4b6e32360184e557204e100ad64357f5575d4b SHA512 40b93e194ad41a75d649d84d1c49070680f253a13f0617803243bc61c44fed1ca2d0a7572a97ebb79353f312b58b5f6360be916dd7435928cc53935082e15269
 DIST gcc-multilib-bootstrap-20180511.tar.xz 2392908 BLAKE2B f3cf614399368acd8908f60d894c6344a2fa09383b30c1633a0682bc668367c8a2f8c6fec2d41b6e2178d709a2bd8db57e8b2ab56ba263c7d56f819c15acd061 SHA512 98c766e913693ab42ff790557acde2a36a8001e2648046a685b21964200df8d4d52d8452d499c0068c6648284d086ce062c2d36e2c6c2fd8aacd232d193f2853
+DIST gcc-multilib-bootstrap-20201208.tar.xz 5528452 BLAKE2B 16699a6e4df5b2f28a21776ae9e3728b26a9ea251f5580aa5349545ad7c9f6145b9cb6a12ca8f5f96b9cb2a3c70b7e66ca702e4c6f083ac00408e0a20a69e613 SHA512 a243f505e17d0a7e144e8713c077582412f61d6cf7f79baa846de4fb77f5e0f27e11c9a785e14624e04ac52287b32164e7995323aa11caef59113ac438254347
 DIST glibc-2.19-patches-9.tar.bz2 24584 BLAKE2B a96e930a5bd20fa75d9f259cc2117fa5ce98072274a24a5823bf877e3739fa4c001a94d7865e065ee0527f3974430d27da8038e042340a451ad2052c62724f26 SHA512 a95b3063ade974a3556480b798b317d33c7423a8cb9e69f67249ffb8b3d3c671d70d2d5f782c1efadc0bec4cc49a96d4fe89911f3dfcd85b459f69f3b4f38f0e
 DIST glibc-2.19.tar.xz 12083312 BLAKE2B 9dc03346e0f0df4bf009a92d894b0a9f964ff92b7f4c9663cedf1cb6cf90435f28a15539d33791ecf43ee578fa4e26f916af0367651312ef8f9c1c38ce0dafa2 SHA512 9e021fcb3afbb9ace2a0e37fded231a62de861bd766e29d47163a03182e37add718b7acc3963d1c525f9556773e842297725715acde48dcfbaab6e756af1a23d
 DIST glibc-2.25-patches-15.tar.bz2 78320 BLAKE2B 70c62cc10db13e2844de4d8a18972e0f4d01ba52fbd40db57c11d7b1c2c0d571b894f01e762bb26632fd696a77c299ef0766e2f129d2eda896f58325a754a13c SHA512 7204218ea82b677e0f278c4752ddb90aa0c08ac2349d061de81ec91dac204b0f10fe223d7b1055b9e0c21dac97c835f913a90c0168a5000d3be00dd20027c185
diff --git a/sys-libs/glibc/glibc-2.32-r5.ebuild b/sys-libs/glibc/glibc-2.32-r5.ebuild
index b1f87e7e5dd9..1ec93676174c 100644
--- a/sys-libs/glibc/glibc-2.32-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.32-r5.ebuild
@@ -22,8 +22,7 @@ PATCH_DEV=slyfox
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	#Drop keywords for initial testing
-	#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"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 	SRC_URI+=" riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz )"
@@ -31,7 +30,7 @@ fi
 
 RELEASE_VER=${PV}
 
-GCC_BOOTSTRAP_VER=20180511
+GCC_BOOTSTRAP_VER=20201208
 
 LOCALE_GEN_VER=2.10
 
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index c424c7a6b9bd..d15e3bf4e504 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -30,7 +30,7 @@ fi
 
 RELEASE_VER=${PV}
 
-GCC_BOOTSTRAP_VER=20180511
+GCC_BOOTSTRAP_VER=20201208
 
 LOCALE_GEN_VER=2.10
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 8ccbd4e2d69e..c88b359b118b 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 94a269445e5b..79e4bdb3399d 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1 +1,2 @@
 DIST microsoft-edge-dev_88.0.705.15-1_amd64.deb 87945596 BLAKE2B a770aa4edc4f11d350b7ff77dcc7d953115c815caebac5d9858f8ed5e24ec14d4f407ae3ad7f97d32f78849f024c91b75278c21eecdd8197f0c375253fcca653 SHA512 ad388d4b784e71db4f7e30f2f5ee36d3e8abcd7e2c3cac351e68d1a81476017d1c3e784fda2aaf59ec98b537d6ab3ee90aeb8e77597c3204122c6770149b427e
+DIST microsoft-edge-dev_89.0.723.0-1_amd64.deb 89214260 BLAKE2B 9cf78e3e6e77e7efbe78e830e84fcb767508e3f6d2872846b48525d50445d468b53351b1837387a803226f94785eec06360df305bb27e8bee378ee813d085516 SHA512 699e9a2005dcc5363921b05b077d34094550e543cf960f1ee531c9c3f16c77971945c380a4e200451ab95c41ddd484d525b8e50934f5c25df8d3e5e499f440f6
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-89.0.723.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-89.0.723.0.ebuild
new file mode 100644
index 000000000000..41108ab2bece
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-89.0.723.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit chromium-2 desktop pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	KEYWORDS="-* amd64"
+	MY_PN=${PN}-stable
+else
+	KEYWORDS="-* ~amd64"
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/wget
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}